diff --git a/.gitignore b/.gitignore index 55f9203a81d..d4fd3762cb4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,9 @@ dist-ssr *.sln *.sw? +# Docummentation +docs/* + public/images/trainer/convert/* public/images/battle_anims/input/*.png public/images/pokemon/input/*.png diff --git a/README.md b/README.md index ad2237bb459..c5d4f1f0525 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite # 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 **#vote** channel in the discord. +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 @@ -46,7 +46,6 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s - Pokémon Black/White 2 - Firel (Custom Metropolis and Laboratory biome music) - Lmz (Custom Jungle biome music) - - edifette (Title screen music) ### 🎵 Sound Effects - Pokémon Emerald diff --git a/public/audio/bgm/title.mp3 b/public/audio/bgm/title.mp3 index c71c2192f4e..373b56e3acd 100644 Binary files a/public/audio/bgm/title.mp3 and b/public/audio/bgm/title.mp3 differ diff --git a/public/images/cg/end_f.png b/public/images/cg/end_f.png new file mode 100644 index 00000000000..84f94d7e05d Binary files /dev/null and b/public/images/cg/end_f.png differ diff --git a/public/images/cg/end_m.png b/public/images/cg/end_m.png new file mode 100644 index 00000000000..abdcb49aff9 Binary files /dev/null and b/public/images/cg/end_m.png differ diff --git a/public/images/pokemon/472.png b/public/images/pokemon/472.png index 29edcce231c..56f3c91aa9b 100644 Binary files a/public/images/pokemon/472.png and b/public/images/pokemon/472.png differ diff --git a/public/images/pokemon/569-gigantamax.png b/public/images/pokemon/569-gigantamax.png index f02b20d4157..d367d8d359d 100644 Binary files a/public/images/pokemon/569-gigantamax.png and b/public/images/pokemon/569-gigantamax.png differ diff --git a/public/images/pokemon/715.png b/public/images/pokemon/715.png index 6b46b4e709d..a13b8f435e4 100644 Binary files a/public/images/pokemon/715.png and b/public/images/pokemon/715.png differ diff --git a/public/images/pokemon/862.png b/public/images/pokemon/862.png index 838bd9aa170..4d6daf0a7da 100644 Binary files a/public/images/pokemon/862.png and b/public/images/pokemon/862.png differ diff --git a/public/images/pokemon/back/569-gigantamax.png b/public/images/pokemon/back/569-gigantamax.png index cdfe8c18905..ca4e897ecc2 100644 Binary files a/public/images/pokemon/back/569-gigantamax.png and b/public/images/pokemon/back/569-gigantamax.png differ diff --git a/public/images/pokemon/exp/770.json b/public/images/pokemon/exp/770.json index 177bf3a59ab..1b68b54db41 100644 --- a/public/images/pokemon/exp/770.json +++ b/public/images/pokemon/exp/770.json @@ -4,282 +4,30 @@ "image": "770.png", "format": "RGBA8888", "size": { - "w": 262, - "h": 262 + "w": 375, + "h": 375 }, "scale": 1, "frames": [ - { - "filename": "0006.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 92, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 92, - "h": 67 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 92, - "h": 67 - }, - "frame": { - "x": 0, - "y": 0, - "w": 92, - "h": 67 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 67 - }, - "frame": { - "x": 92, - "y": 0, - "w": 90, - "h": 67 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 90, - "h": 67 - }, - "frame": { - "x": 92, - "y": 0, - "w": 90, - "h": 67 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 92, - "h": 65 - }, - "frame": { - "x": 0, - "y": 67, - "w": 92, - "h": 65 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 91, - "h": 65 - }, - "frame": { - "x": 92, - "y": 67, - "w": 91, - "h": 65 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 91, - "h": 65 - }, - "frame": { - "x": 92, - "y": 67, - "w": 91, - "h": 65 - } - }, { "filename": "0005.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 92, - "h": 67 + "w": 96, + "h": 57 }, "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 89, - "h": 66 - }, - "frame": { - "x": 0, - "y": 132, - "w": 89, - "h": 66 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 89, - "h": 66 - }, - "frame": { - "x": 0, - "y": 132, - "w": 89, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 88, - "h": 64 - }, - "frame": { - "x": 0, - "y": 198, - "w": 88, - "h": 64 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 88, - "h": 64 - }, - "frame": { - "x": 0, - "y": 198, - "w": 88, - "h": 64 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 3, + "x": 5, "y": 2, "w": 87, - "h": 64 + "h": 55 }, "frame": { - "x": 88, - "y": 198, + "x": 0, + "y": 0, "w": 87, - "h": 64 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 92, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 89, - "h": 65 - }, - "frame": { - "x": 89, - "y": 132, - "w": 89, - "h": 65 + "h": 55 } }, { @@ -287,20 +35,1322 @@ "rotated": false, "trimmed": true, "sourceSize": { - "w": 92, - "h": 67 + "w": 96, + "h": 57 }, "spriteSourceSize": { - "x": 1, - "y": 1, - "w": 89, - "h": 65 + "x": 5, + "y": 2, + "w": 87, + "h": 55 }, "frame": { - "x": 89, - "y": 132, - "w": 89, - "h": 65 + "x": 0, + "y": 0, + "w": 87, + "h": 55 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 87, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 87, + "h": 55 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 87, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 87, + "h": 55 + } + }, + { + "filename": "0045.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 87, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 87, + "h": 55 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 87, + "h": 55 + }, + "frame": { + "x": 0, + "y": 55, + "w": 87, + "h": 55 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 85, + "h": 56 + }, + "frame": { + "x": 87, + "y": 0, + "w": 85, + "h": 56 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 85, + "h": 56 + }, + "frame": { + "x": 87, + "y": 0, + "w": 85, + "h": 56 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 85, + "h": 56 + }, + "frame": { + "x": 87, + "y": 0, + "w": 85, + "h": 56 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 85, + "h": 56 + }, + "frame": { + "x": 87, + "y": 0, + "w": 85, + "h": 56 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 85, + "h": 56 + }, + "frame": { + "x": 87, + "y": 0, + "w": 85, + "h": 56 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 85, + "h": 56 + }, + "frame": { + "x": 0, + "y": 110, + "w": 85, + "h": 56 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 85, + "h": 55 + }, + "frame": { + "x": 172, + "y": 0, + "w": 85, + "h": 55 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 85, + "h": 55 + }, + "frame": { + "x": 172, + "y": 0, + "w": 85, + "h": 55 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 85, + "h": 55 + }, + "frame": { + "x": 172, + "y": 0, + "w": 85, + "h": 55 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 85, + "h": 55 + }, + "frame": { + "x": 172, + "y": 0, + "w": 85, + "h": 55 + } + }, + { + "filename": "0044.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 85, + "h": 55 + }, + "frame": { + "x": 172, + "y": 0, + "w": 85, + "h": 55 + } + }, + { + "filename": "0020.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 85, + "h": 55 + }, + "frame": { + "x": 0, + "y": 166, + "w": 85, + "h": 55 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 82, + "h": 57 + }, + "frame": { + "x": 0, + "y": 221, + "w": 82, + "h": 57 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 82, + "h": 57 + }, + "frame": { + "x": 0, + "y": 221, + "w": 82, + "h": 57 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 82, + "h": 57 + }, + "frame": { + "x": 0, + "y": 221, + "w": 82, + "h": 57 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 82, + "h": 57 + }, + "frame": { + "x": 0, + "y": 221, + "w": 82, + "h": 57 + } + }, + { + "filename": "0047.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 82, + "h": 57 + }, + "frame": { + "x": 0, + "y": 221, + "w": 82, + "h": 57 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 82, + "h": 57 + }, + "frame": { + "x": 0, + "y": 278, + "w": 82, + "h": 57 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 82, + "h": 56 + }, + "frame": { + "x": 257, + "y": 0, + "w": 82, + "h": 56 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 82, + "h": 56 + }, + "frame": { + "x": 257, + "y": 0, + "w": 82, + "h": 56 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 82, + "h": 56 + }, + "frame": { + "x": 257, + "y": 0, + "w": 82, + "h": 56 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 82, + "h": 56 + }, + "frame": { + "x": 257, + "y": 0, + "w": 82, + "h": 56 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 82, + "h": 56 + }, + "frame": { + "x": 257, + "y": 0, + "w": 82, + "h": 56 + } + }, + { + "filename": "0043.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 82, + "h": 56 + }, + "frame": { + "x": 257, + "y": 0, + "w": 82, + "h": 56 + } + }, + { + "filename": "0051.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 82, + "h": 54 + }, + "frame": { + "x": 87, + "y": 56, + "w": 82, + "h": 54 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 110, + "w": 80, + "h": 57 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 110, + "w": 80, + "h": 57 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 110, + "w": 80, + "h": 57 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 110, + "w": 80, + "h": 57 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 110, + "w": 80, + "h": 57 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 167, + "w": 80, + "h": 57 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 167, + "w": 80, + "h": 57 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 167, + "w": 80, + "h": 57 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 167, + "w": 80, + "h": 57 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 85, + "y": 167, + "w": 80, + "h": 57 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 82, + "y": 224, + "w": 80, + "h": 57 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 82, + "y": 281, + "w": 80, + "h": 57 + } + }, + { + "filename": "0054.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 0, + "y": 20, + "w": 96, + "h": 37 + }, + "frame": { + "x": 0, + "y": 338, + "w": 96, + "h": 37 + } + }, + { + "filename": "0055.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 0, + "y": 20, + "w": 96, + "h": 37 + }, + "frame": { + "x": 96, + "y": 338, + "w": 96, + "h": 37 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 0, + "y": 20, + "w": 96, + "h": 37 + }, + "frame": { + "x": 96, + "y": 338, + "w": 96, + "h": 37 + } + }, + { + "filename": "0052.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 9, + "w": 85, + "h": 48 + }, + "frame": { + "x": 172, + "y": 55, + "w": 85, + "h": 48 + } + }, + { + "filename": "0061.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 6, + "y": 9, + "w": 85, + "h": 48 + }, + "frame": { + "x": 257, + "y": 56, + "w": 85, + "h": 48 + } + }, + { + "filename": "0062.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 82, + "h": 54 + }, + "frame": { + "x": 169, + "y": 103, + "w": 82, + "h": 54 + } + }, + { + "filename": "0050.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 165, + "y": 157, + "w": 80, + "h": 57 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 80, + "h": 57 + }, + "frame": { + "x": 251, + "y": 104, + "w": 80, + "h": 57 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 245, + "y": 161, + "w": 78, + "h": 57 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 245, + "y": 161, + "w": 78, + "h": 57 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 245, + "y": 161, + "w": 78, + "h": 57 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 245, + "y": 161, + "w": 78, + "h": 57 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 245, + "y": 161, + "w": 78, + "h": 57 + } + }, + { + "filename": "0049.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 245, + "y": 161, + "w": 78, + "h": 57 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 165, + "y": 214, + "w": 78, + "h": 57 + } + }, + { + "filename": "0064.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 78, + "h": 57 + }, + "frame": { + "x": 162, + "y": 271, + "w": 78, + "h": 57 + } + }, + { + "filename": "0053.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 2, + "y": 18, + "w": 92, + "h": 39 + }, + "frame": { + "x": 243, + "y": 218, + "w": 92, + "h": 39 + } + }, + { + "filename": "0056.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 0, + "y": 20, + "w": 96, + "h": 37 + }, + "frame": { + "x": 243, + "y": 257, + "w": 96, + "h": 37 + } + }, + { + "filename": "0058.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 0, + "y": 20, + "w": 96, + "h": 37 + }, + "frame": { + "x": 243, + "y": 257, + "w": 96, + "h": 37 + } + }, + { + "filename": "0057.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 0, + "y": 20, + "w": 96, + "h": 37 + }, + "frame": { + "x": 240, + "y": 294, + "w": 96, + "h": 37 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 96, + "h": 57 + }, + "spriteSourceSize": { + "x": 2, + "y": 18, + "w": 92, + "h": 39 + }, + "frame": { + "x": 192, + "y": 331, + "w": 92, + "h": 39 } } ] @@ -309,6 +1359,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:dd7c7ffc4b681323c2706629f36fe7c8:f0d281216c0f759cc9a36131bb45354a:9a5e6a86eb0697afa19bc4a32f422cc1$" + "smartupdate": "$TexturePacker:SmartUpdate:ce33d806b6d3aeb64a87ace5887286f6:bf1c87696fd9940bcd542fd3d1696df1:9a5e6a86eb0697afa19bc4a32f422cc1$" } } diff --git a/public/images/pokemon/exp/770.png b/public/images/pokemon/exp/770.png index b6f3b05413d..7cfd1179298 100644 Binary files a/public/images/pokemon/exp/770.png and b/public/images/pokemon/exp/770.png differ diff --git a/public/images/pokemon/exp/970.png b/public/images/pokemon/exp/970.png index 3ad8a02df5e..1c3a4c3c592 100644 Binary files a/public/images/pokemon/exp/970.png and b/public/images/pokemon/exp/970.png differ diff --git a/public/images/pokemon/exp/back/970.png b/public/images/pokemon/exp/back/970.png index b21c87a49bd..bd6464a7bfa 100644 Binary files a/public/images/pokemon/exp/back/970.png and b/public/images/pokemon/exp/back/970.png differ diff --git a/public/images/pokemon/exp/shiny/679.png b/public/images/pokemon/exp/shiny/679.png index f65ed8f5e82..43d62a6d928 100644 Binary files a/public/images/pokemon/exp/shiny/679.png and b/public/images/pokemon/exp/shiny/679.png differ diff --git a/public/images/pokemon/exp/shiny/932.json b/public/images/pokemon/exp/shiny/932.json index 58cbf56c436..11473460ef2 100644 --- a/public/images/pokemon/exp/shiny/932.json +++ b/public/images/pokemon/exp/shiny/932.json @@ -4,8 +4,8 @@ "image": "932.png", "format": "RGBA8888", "size": { - "w": 294, - "h": 294 + "w": 147, + "h": 147 }, "scale": 1, "frames": [ @@ -30,6 +30,69 @@ "h": 49 } }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 48, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 48, + "h": 49 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 48, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 48, + "h": 49 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 48, + "h": 49 + }, + "frame": { + "x": 0, + "y": 0, + "w": 48, + "h": 49 + } + }, { "filename": "0008.png", "rotated": false, @@ -45,52 +108,10 @@ "h": 49 }, "frame": { - "x": 0, - "y": 49, - "w": 48, - "h": 49 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, + "x": 48, "y": 0, "w": 48, "h": 49 - }, - "frame": { - "x": 0, - "y": 98, - "w": 48, - "h": 49 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 48, - "h": 49 - }, - "frame": { - "x": 0, - "y": 98, - "w": 48, - "h": 49 } }, { @@ -108,31 +129,10 @@ "h": 49 }, "frame": { - "x": 0, - "y": 147, - "w": 48, - "h": 49 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, + "x": 48, "y": 0, "w": 48, "h": 49 - }, - "frame": { - "x": 0, - "y": 196, - "w": 48, - "h": 49 } }, { @@ -150,8 +150,8 @@ "h": 49 }, "frame": { - "x": 0, - "y": 245, + "x": 48, + "y": 0, "w": 48, "h": 49 } @@ -213,7 +213,49 @@ "h": 49 }, "frame": { - "x": 143, + "x": 96, + "y": 0, + "w": 47, + "h": 49 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 96, + "y": 0, + "w": 47, + "h": 49 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 96, "y": 0, "w": 47, "h": 49 @@ -234,7 +276,7 @@ "h": 49 }, "frame": { - "x": 143, + "x": 96, "y": 0, "w": 47, "h": 49 @@ -255,7 +297,49 @@ "h": 49 }, "frame": { - "x": 143, + "x": 96, + "y": 0, + "w": 47, + "h": 49 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 96, + "y": 0, + "w": 47, + "h": 49 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 96, "y": 0, "w": 47, "h": 49 @@ -276,159 +360,12 @@ "h": 49 }, "frame": { - "x": 190, - "y": 0, - "w": 47, - "h": 49 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 190, - "y": 0, - "w": 47, - "h": 49 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 237, - "y": 0, - "w": 47, - "h": 49 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { "x": 0, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 48, "y": 49, "w": 47, "h": 49 } }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 48, - "y": 98, - "w": 47, - "h": 49 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 48, - "y": 147, - "w": 47, - "h": 49 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 48, - "y": 196, - "w": 47, - "h": 49 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 48, - "y": 245, - "w": 47, - "h": 49 - } - }, { "filename": "0012.png", "rotated": false, @@ -444,7 +381,70 @@ "h": 49 }, "frame": { - "x": 95, + "x": 0, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 0, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 0, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 47, "y": 49, "w": 47, "h": 49 @@ -465,7 +465,91 @@ "h": 49 }, "frame": { - "x": 142, + "x": 47, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 47, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 47, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 94, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 94, "y": 49, "w": 47, "h": 49 @@ -486,70 +570,7 @@ "h": 49 }, "frame": { - "x": 189, - "y": 49, - "w": 47, - "h": 49 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 189, - "y": 49, - "w": 47, - "h": 49 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 189, - "y": 49, - "w": 47, - "h": 49 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 189, + "x": 94, "y": 49, "w": 47, "h": 49 @@ -570,14 +591,14 @@ "h": 49 }, "frame": { - "x": 236, + "x": 94, "y": 49, "w": 47, "h": 49 } }, { - "filename": "0018.png", + "filename": "0024.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -585,56 +606,14 @@ "h": 49 }, "spriteSourceSize": { - "x": 1, + "x": 0, "y": 0, "w": 47, "h": 49 }, "frame": { - "x": 95, - "y": 98, - "w": 47, - "h": 49 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 95, - "y": 147, - "w": 47, - "h": 49 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 95, - "y": 196, + "x": 94, + "y": 49, "w": 47, "h": 49 } @@ -654,8 +633,92 @@ "h": 49 }, "frame": { - "x": 95, - "y": 245, + "x": 94, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 94, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 94, + "y": 49, + "w": 47, + "h": 49 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 0, + "y": 98, + "w": 47, + "h": 49 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 49 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 47, + "h": 49 + }, + "frame": { + "x": 0, + "y": 98, "w": 47, "h": 49 } @@ -675,75 +738,12 @@ "h": 49 }, "frame": { - "x": 142, + "x": 0, "y": 98, "w": 47, "h": 49 } }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 189, - "y": 98, - "w": 47, - "h": 49 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 236, - "y": 98, - "w": 47, - "h": 49 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 48, - "h": 49 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 47, - "h": 49 - }, - "frame": { - "x": 142, - "y": 147, - "w": 47, - "h": 49 - } - }, { "filename": "0036.png", "rotated": false, @@ -759,8 +759,8 @@ "h": 49 }, "frame": { - "x": 142, - "y": 196, + "x": 0, + "y": 98, "w": 47, "h": 49 } @@ -780,8 +780,8 @@ "h": 49 }, "frame": { - "x": 142, - "y": 245, + "x": 47, + "y": 98, "w": 47, "h": 49 } @@ -801,8 +801,8 @@ "h": 49 }, "frame": { - "x": 189, - "y": 147, + "x": 94, + "y": 98, "w": 47, "h": 49 } @@ -813,6 +813,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:92f56cb0554b8fbfda1578295eb5275b:e2b2250f4b68aac4f8e27eb1485dd131:ac6592b1ff7d7b5afb4c4b933cec3f50$" + "smartupdate": "$TexturePacker:SmartUpdate:56f22a59e3b5dc3b3a0b87fa1b0040f4:2e1654fddb365c17252def724f3b66f1:ac6592b1ff7d7b5afb4c4b933cec3f50$" } } diff --git a/public/images/pokemon/exp/shiny/932.png b/public/images/pokemon/exp/shiny/932.png index 0f09fc80010..8ad0f2e12a3 100644 Binary files a/public/images/pokemon/exp/shiny/932.png and b/public/images/pokemon/exp/shiny/932.png differ diff --git a/public/images/pokemon/shiny/1018.png b/public/images/pokemon/shiny/1018.png index 3cfa3be8499..7c753bb05e5 100644 Binary files a/public/images/pokemon/shiny/1018.png and b/public/images/pokemon/shiny/1018.png differ diff --git a/public/images/pokemon/shiny/472.png b/public/images/pokemon/shiny/472.png index eab32958498..f1e833b66cb 100644 Binary files a/public/images/pokemon/shiny/472.png and b/public/images/pokemon/shiny/472.png differ diff --git a/public/images/pokemon/shiny/862.png b/public/images/pokemon/shiny/862.png index edf389955b9..bc949797ee9 100644 Binary files a/public/images/pokemon/shiny/862.png and b/public/images/pokemon/shiny/862.png differ diff --git a/public/images/pokemon/variant/169_1.png b/public/images/pokemon/variant/169_1.png new file mode 100644 index 00000000000..1baf868c278 Binary files /dev/null and b/public/images/pokemon/variant/169_1.png differ diff --git a/public/images/pokemon/variant/212-mega_2.png b/public/images/pokemon/variant/212-mega_2.png new file mode 100644 index 00000000000..a4db96d6aac Binary files /dev/null and b/public/images/pokemon/variant/212-mega_2.png differ diff --git a/public/images/pokemon/variant/212-mega_3.png b/public/images/pokemon/variant/212-mega_3.png new file mode 100644 index 00000000000..dac4b3bd552 Binary files /dev/null and b/public/images/pokemon/variant/212-mega_3.png differ diff --git a/public/images/pokemon/variant/212_2.png b/public/images/pokemon/variant/212_2.png new file mode 100644 index 00000000000..913ab71026d Binary files /dev/null and b/public/images/pokemon/variant/212_2.png differ diff --git a/public/images/pokemon/variant/212_3.png b/public/images/pokemon/variant/212_3.png new file mode 100644 index 00000000000..6a027cd53dc Binary files /dev/null and b/public/images/pokemon/variant/212_3.png differ diff --git a/public/images/pokemon/variant/280_2.png b/public/images/pokemon/variant/280_2.png new file mode 100644 index 00000000000..1d342f178e6 Binary files /dev/null and b/public/images/pokemon/variant/280_2.png differ diff --git a/public/images/pokemon/variant/280_3.png b/public/images/pokemon/variant/280_3.png new file mode 100644 index 00000000000..6803b7d4a40 Binary files /dev/null and b/public/images/pokemon/variant/280_3.png differ diff --git a/public/images/pokemon/variant/281_2.png b/public/images/pokemon/variant/281_2.png new file mode 100644 index 00000000000..e461a6bc565 Binary files /dev/null and b/public/images/pokemon/variant/281_2.png differ diff --git a/public/images/pokemon/variant/281_3.png b/public/images/pokemon/variant/281_3.png new file mode 100644 index 00000000000..bc83ede10d0 Binary files /dev/null and b/public/images/pokemon/variant/281_3.png differ diff --git a/public/images/pokemon/variant/282-mega_2.png b/public/images/pokemon/variant/282-mega_2.png index f815df36bf7..1060939513a 100644 Binary files a/public/images/pokemon/variant/282-mega_2.png and b/public/images/pokemon/variant/282-mega_2.png differ diff --git a/public/images/pokemon/variant/282-mega_3.png b/public/images/pokemon/variant/282-mega_3.png index 6b027c79722..027355e2b59 100644 Binary files a/public/images/pokemon/variant/282-mega_3.png and b/public/images/pokemon/variant/282-mega_3.png differ diff --git a/public/images/pokemon/variant/282_2.png b/public/images/pokemon/variant/282_2.png new file mode 100644 index 00000000000..edb797c095a Binary files /dev/null and b/public/images/pokemon/variant/282_2.png differ diff --git a/public/images/pokemon/variant/282_3.png b/public/images/pokemon/variant/282_3.png new file mode 100644 index 00000000000..614f68cc220 Binary files /dev/null and b/public/images/pokemon/variant/282_3.png differ diff --git a/public/images/pokemon/variant/41_1.png b/public/images/pokemon/variant/41_1.png new file mode 100644 index 00000000000..003d45e5591 Binary files /dev/null and b/public/images/pokemon/variant/41_1.png differ diff --git a/public/images/pokemon/variant/41_2.png b/public/images/pokemon/variant/41_2.png new file mode 100644 index 00000000000..59605d5265a Binary files /dev/null and b/public/images/pokemon/variant/41_2.png differ diff --git a/public/images/pokemon/variant/41_3.png b/public/images/pokemon/variant/41_3.png new file mode 100644 index 00000000000..cd8c4542d2c Binary files /dev/null and b/public/images/pokemon/variant/41_3.png differ diff --git a/public/images/pokemon/variant/42_2.png b/public/images/pokemon/variant/42_2.png new file mode 100644 index 00000000000..629e3a926f4 Binary files /dev/null and b/public/images/pokemon/variant/42_2.png differ diff --git a/public/images/pokemon/variant/42_3.png b/public/images/pokemon/variant/42_3.png new file mode 100644 index 00000000000..6fcfcbf1859 Binary files /dev/null and b/public/images/pokemon/variant/42_3.png differ diff --git a/public/images/pokemon/variant/475-mega_2.png b/public/images/pokemon/variant/475-mega_2.png index baa06e1e1a4..fd20272c2eb 100644 Binary files a/public/images/pokemon/variant/475-mega_2.png and b/public/images/pokemon/variant/475-mega_2.png differ diff --git a/public/images/pokemon/variant/475-mega_3.png b/public/images/pokemon/variant/475-mega_3.png index 12510000dd4..f549b85f700 100644 Binary files a/public/images/pokemon/variant/475-mega_3.png and b/public/images/pokemon/variant/475-mega_3.png differ diff --git a/public/images/pokemon/variant/475_2.png b/public/images/pokemon/variant/475_2.png new file mode 100644 index 00000000000..a2cd3f58fbd Binary files /dev/null and b/public/images/pokemon/variant/475_2.png differ diff --git a/public/images/pokemon/variant/475_3.png b/public/images/pokemon/variant/475_3.png new file mode 100644 index 00000000000..7936479060c Binary files /dev/null and b/public/images/pokemon/variant/475_3.png differ diff --git a/public/images/pokemon/variant/622_1.png b/public/images/pokemon/variant/622_1.png new file mode 100644 index 00000000000..615a9a629ae Binary files /dev/null and b/public/images/pokemon/variant/622_1.png differ diff --git a/public/images/pokemon/variant/622_2.png b/public/images/pokemon/variant/622_2.png new file mode 100644 index 00000000000..1ce1c3e9f0e Binary files /dev/null and b/public/images/pokemon/variant/622_2.png differ diff --git a/public/images/pokemon/variant/623_1.png b/public/images/pokemon/variant/623_1.png new file mode 100644 index 00000000000..836f46d459f Binary files /dev/null and b/public/images/pokemon/variant/623_1.png differ diff --git a/public/images/pokemon/variant/623_2.png b/public/images/pokemon/variant/623_2.png new file mode 100644 index 00000000000..fc7de7bdccb Binary files /dev/null and b/public/images/pokemon/variant/623_2.png differ diff --git a/public/images/pokemon/variant/862_2.png b/public/images/pokemon/variant/862_2.png new file mode 100644 index 00000000000..d006a389c11 Binary files /dev/null and b/public/images/pokemon/variant/862_2.png differ diff --git a/public/images/pokemon/variant/862_3.png b/public/images/pokemon/variant/862_3.png new file mode 100644 index 00000000000..1d9240d85e6 Binary files /dev/null and b/public/images/pokemon/variant/862_3.png differ diff --git a/public/images/pokemon/variant/890-eternamax_2.png b/public/images/pokemon/variant/890-eternamax_2.png index eade2d6c3c9..30c8333a431 100644 Binary files a/public/images/pokemon/variant/890-eternamax_2.png and b/public/images/pokemon/variant/890-eternamax_2.png differ diff --git a/public/images/pokemon/variant/890-eternamax_3.png b/public/images/pokemon/variant/890-eternamax_3.png index 0381080b24b..48cd4dbe14a 100644 Binary files a/public/images/pokemon/variant/890-eternamax_3.png and b/public/images/pokemon/variant/890-eternamax_3.png differ diff --git a/public/images/pokemon/variant/890_2.png b/public/images/pokemon/variant/890_2.png new file mode 100644 index 00000000000..46d2a4590a4 Binary files /dev/null and b/public/images/pokemon/variant/890_2.png differ diff --git a/public/images/pokemon/variant/890_3.png b/public/images/pokemon/variant/890_3.png new file mode 100644 index 00000000000..635272e7e17 Binary files /dev/null and b/public/images/pokemon/variant/890_3.png differ diff --git a/public/images/pokemon/variant/936_3.png b/public/images/pokemon/variant/936_3.png index 2492838dc09..145318edc68 100644 Binary files a/public/images/pokemon/variant/936_3.png and b/public/images/pokemon/variant/936_3.png differ diff --git a/public/images/pokemon/variant/937_3.png b/public/images/pokemon/variant/937_3.png index fbad4efbcc6..c3d0b01a401 100644 Binary files a/public/images/pokemon/variant/937_3.png and b/public/images/pokemon/variant/937_3.png differ diff --git a/public/images/pokemon/variant/back/169_2.png b/public/images/pokemon/variant/back/169_2.png new file mode 100644 index 00000000000..5270355c4a8 Binary files /dev/null and b/public/images/pokemon/variant/back/169_2.png differ diff --git a/public/images/pokemon/variant/back/212-mega_2.png b/public/images/pokemon/variant/back/212-mega_2.png new file mode 100644 index 00000000000..adf745f6851 Binary files /dev/null and b/public/images/pokemon/variant/back/212-mega_2.png differ diff --git a/public/images/pokemon/variant/back/212-mega_3.png b/public/images/pokemon/variant/back/212-mega_3.png new file mode 100644 index 00000000000..0cfead081c4 Binary files /dev/null and b/public/images/pokemon/variant/back/212-mega_3.png differ diff --git a/public/images/pokemon/variant/back/212_2.png b/public/images/pokemon/variant/back/212_2.png new file mode 100644 index 00000000000..9f325d62aa9 Binary files /dev/null and b/public/images/pokemon/variant/back/212_2.png differ diff --git a/public/images/pokemon/variant/back/212_3.png b/public/images/pokemon/variant/back/212_3.png new file mode 100644 index 00000000000..d06a89140c7 Binary files /dev/null and b/public/images/pokemon/variant/back/212_3.png differ diff --git a/public/images/pokemon/variant/back/280_2.png b/public/images/pokemon/variant/back/280_2.png new file mode 100644 index 00000000000..fcd4b0f8dc7 Binary files /dev/null and b/public/images/pokemon/variant/back/280_2.png differ diff --git a/public/images/pokemon/variant/back/280_3.png b/public/images/pokemon/variant/back/280_3.png new file mode 100644 index 00000000000..977b872ce4c Binary files /dev/null and b/public/images/pokemon/variant/back/280_3.png differ diff --git a/public/images/pokemon/variant/back/281_2.png b/public/images/pokemon/variant/back/281_2.png new file mode 100644 index 00000000000..a09255d48c5 Binary files /dev/null and b/public/images/pokemon/variant/back/281_2.png differ diff --git a/public/images/pokemon/variant/back/281_3.png b/public/images/pokemon/variant/back/281_3.png new file mode 100644 index 00000000000..725caa8b2a2 Binary files /dev/null and b/public/images/pokemon/variant/back/281_3.png differ diff --git a/public/images/pokemon/variant/back/282-mega_2.png b/public/images/pokemon/variant/back/282-mega_2.png new file mode 100644 index 00000000000..56cd3805918 Binary files /dev/null and b/public/images/pokemon/variant/back/282-mega_2.png differ diff --git a/public/images/pokemon/variant/back/282-mega_3.png b/public/images/pokemon/variant/back/282-mega_3.png new file mode 100644 index 00000000000..0ab20d5a7b4 Binary files /dev/null and b/public/images/pokemon/variant/back/282-mega_3.png differ diff --git a/public/images/pokemon/variant/back/282_2.png b/public/images/pokemon/variant/back/282_2.png new file mode 100644 index 00000000000..f65c59993b1 Binary files /dev/null and b/public/images/pokemon/variant/back/282_2.png differ diff --git a/public/images/pokemon/variant/back/282_3.png b/public/images/pokemon/variant/back/282_3.png new file mode 100644 index 00000000000..a5d393d5783 Binary files /dev/null and b/public/images/pokemon/variant/back/282_3.png differ diff --git a/public/images/pokemon/variant/back/383_2.png b/public/images/pokemon/variant/back/383_2.png index 0d25afe7e54..98ac154832f 100644 Binary files a/public/images/pokemon/variant/back/383_2.png and b/public/images/pokemon/variant/back/383_2.png differ diff --git a/public/images/pokemon/variant/back/383_3.png b/public/images/pokemon/variant/back/383_3.png new file mode 100644 index 00000000000..f8856a6aa2d Binary files /dev/null and b/public/images/pokemon/variant/back/383_3.png differ diff --git a/public/images/pokemon/variant/back/41_1.png b/public/images/pokemon/variant/back/41_1.png new file mode 100644 index 00000000000..6943a2eddb4 Binary files /dev/null and b/public/images/pokemon/variant/back/41_1.png differ diff --git a/public/images/pokemon/variant/back/42_1.png b/public/images/pokemon/variant/back/42_1.png new file mode 100644 index 00000000000..2f649cdc649 Binary files /dev/null and b/public/images/pokemon/variant/back/42_1.png differ diff --git a/public/images/pokemon/variant/back/475-mega_2.png b/public/images/pokemon/variant/back/475-mega_2.png index 6d926369a69..49e9e83929e 100644 Binary files a/public/images/pokemon/variant/back/475-mega_2.png and b/public/images/pokemon/variant/back/475-mega_2.png differ diff --git a/public/images/pokemon/variant/back/475-mega_3.png b/public/images/pokemon/variant/back/475-mega_3.png index 16ce72c9621..9ad3c9d53dc 100644 Binary files a/public/images/pokemon/variant/back/475-mega_3.png and b/public/images/pokemon/variant/back/475-mega_3.png differ diff --git a/public/images/pokemon/variant/back/475_2.png b/public/images/pokemon/variant/back/475_2.png new file mode 100644 index 00000000000..5b2dd404dce Binary files /dev/null and b/public/images/pokemon/variant/back/475_2.png differ diff --git a/public/images/pokemon/variant/back/475_3.png b/public/images/pokemon/variant/back/475_3.png new file mode 100644 index 00000000000..58a981d8979 Binary files /dev/null and b/public/images/pokemon/variant/back/475_3.png differ diff --git a/public/images/pokemon/variant/back/622_1.png b/public/images/pokemon/variant/back/622_1.png new file mode 100644 index 00000000000..8caa7b15ac0 Binary files /dev/null and b/public/images/pokemon/variant/back/622_1.png differ diff --git a/public/images/pokemon/variant/back/622_2.png b/public/images/pokemon/variant/back/622_2.png new file mode 100644 index 00000000000..9e57b6fd73a Binary files /dev/null and b/public/images/pokemon/variant/back/622_2.png differ diff --git a/public/images/pokemon/variant/back/623_1.png b/public/images/pokemon/variant/back/623_1.png new file mode 100644 index 00000000000..b02cc764502 Binary files /dev/null and b/public/images/pokemon/variant/back/623_1.png differ diff --git a/public/images/pokemon/variant/back/623_2.png b/public/images/pokemon/variant/back/623_2.png new file mode 100644 index 00000000000..456f439cd86 Binary files /dev/null and b/public/images/pokemon/variant/back/623_2.png differ diff --git a/public/images/pokemon/variant/back/862_2.png b/public/images/pokemon/variant/back/862_2.png new file mode 100644 index 00000000000..705898eb9a7 Binary files /dev/null and b/public/images/pokemon/variant/back/862_2.png differ diff --git a/public/images/pokemon/variant/back/862_3.png b/public/images/pokemon/variant/back/862_3.png new file mode 100644 index 00000000000..92f81bfe220 Binary files /dev/null and b/public/images/pokemon/variant/back/862_3.png differ diff --git a/public/images/pokemon/variant/back/935_1.png b/public/images/pokemon/variant/back/935_1.png index e95f561fd9c..12a3414c427 100644 Binary files a/public/images/pokemon/variant/back/935_1.png and b/public/images/pokemon/variant/back/935_1.png differ diff --git a/public/images/pokemon/variant/back/935_2.png b/public/images/pokemon/variant/back/935_2.png index 8ae222946a3..20e48938759 100644 Binary files a/public/images/pokemon/variant/back/935_2.png and b/public/images/pokemon/variant/back/935_2.png differ diff --git a/public/images/pokemon/variant/back/935_3.png b/public/images/pokemon/variant/back/935_3.png index 9eb28732292..8e67039cfd7 100644 Binary files a/public/images/pokemon/variant/back/935_3.png and b/public/images/pokemon/variant/back/935_3.png differ diff --git a/public/images/pokemon/variant/back/936_1.png b/public/images/pokemon/variant/back/936_1.png new file mode 100644 index 00000000000..fec1b790865 Binary files /dev/null and b/public/images/pokemon/variant/back/936_1.png differ diff --git a/public/images/pokemon/variant/back/936_2.png b/public/images/pokemon/variant/back/936_2.png new file mode 100644 index 00000000000..4d15c187714 Binary files /dev/null and b/public/images/pokemon/variant/back/936_2.png differ diff --git a/public/images/pokemon/variant/back/936_3.png b/public/images/pokemon/variant/back/936_3.png new file mode 100644 index 00000000000..52e7abf5544 Binary files /dev/null and b/public/images/pokemon/variant/back/936_3.png differ diff --git a/public/images/pokemon/variant/back/937_1.png b/public/images/pokemon/variant/back/937_1.png new file mode 100644 index 00000000000..f6c90b765e8 Binary files /dev/null and b/public/images/pokemon/variant/back/937_1.png differ diff --git a/public/images/pokemon/variant/back/937_2.png b/public/images/pokemon/variant/back/937_2.png new file mode 100644 index 00000000000..b4979bba1b2 Binary files /dev/null and b/public/images/pokemon/variant/back/937_2.png differ diff --git a/public/images/pokemon/variant/back/937_3.png b/public/images/pokemon/variant/back/937_3.png new file mode 100644 index 00000000000..7e4a399e49d Binary files /dev/null and b/public/images/pokemon/variant/back/937_3.png differ diff --git a/public/images/pokemon/variant/back/female/41_2.png b/public/images/pokemon/variant/back/female/41_2.png new file mode 100644 index 00000000000..bd1e22238cc Binary files /dev/null and b/public/images/pokemon/variant/back/female/41_2.png differ diff --git a/public/images/pokemon/variant/back/female/41_3.png b/public/images/pokemon/variant/back/female/41_3.png new file mode 100644 index 00000000000..fec4f49c599 Binary files /dev/null and b/public/images/pokemon/variant/back/female/41_3.png differ diff --git a/public/images/pokemon/variant/back/female/42_2.png b/public/images/pokemon/variant/back/female/42_2.png new file mode 100644 index 00000000000..61360275ca1 Binary files /dev/null and b/public/images/pokemon/variant/back/female/42_2.png differ diff --git a/public/images/pokemon/variant/back/female/42_3.png b/public/images/pokemon/variant/back/female/42_3.png new file mode 100644 index 00000000000..bd86c83f3c0 Binary files /dev/null and b/public/images/pokemon/variant/back/female/42_3.png differ diff --git a/public/images/pokemon/variant/exp/212-mega_2.png b/public/images/pokemon/variant/exp/212-mega_2.png new file mode 100644 index 00000000000..d08116555cd Binary files /dev/null and b/public/images/pokemon/variant/exp/212-mega_2.png differ diff --git a/public/images/pokemon/variant/exp/212-mega_3.png b/public/images/pokemon/variant/exp/212-mega_3.png new file mode 100644 index 00000000000..c93db623fda Binary files /dev/null and b/public/images/pokemon/variant/exp/212-mega_3.png differ diff --git a/public/images/pokemon/variant/exp/282-mega_2.png b/public/images/pokemon/variant/exp/282-mega_2.png index a207e02ab1b..3b9d7b6c718 100644 Binary files a/public/images/pokemon/variant/exp/282-mega_2.png and b/public/images/pokemon/variant/exp/282-mega_2.png differ diff --git a/public/images/pokemon/variant/exp/282-mega_3.png b/public/images/pokemon/variant/exp/282-mega_3.png index b5ce103cf53..1a3de3d92d8 100644 Binary files a/public/images/pokemon/variant/exp/282-mega_3.png and b/public/images/pokemon/variant/exp/282-mega_3.png differ diff --git a/public/images/pokemon/variant/exp/475-mega_2.png b/public/images/pokemon/variant/exp/475-mega_2.png index b41948cc31c..b1b4e9aec31 100644 Binary files a/public/images/pokemon/variant/exp/475-mega_2.png and b/public/images/pokemon/variant/exp/475-mega_2.png differ diff --git a/public/images/pokemon/variant/exp/475-mega_3.png b/public/images/pokemon/variant/exp/475-mega_3.png index c9592a093e5..f15fc37a907 100644 Binary files a/public/images/pokemon/variant/exp/475-mega_3.png and b/public/images/pokemon/variant/exp/475-mega_3.png differ diff --git a/public/images/pokemon/variant/exp/696_2.png b/public/images/pokemon/variant/exp/696_2.png new file mode 100644 index 00000000000..031589b4c30 Binary files /dev/null and b/public/images/pokemon/variant/exp/696_2.png differ diff --git a/public/images/pokemon/variant/exp/696_3.png b/public/images/pokemon/variant/exp/696_3.png index e182d4e24f8..8ec6baa4724 100644 Binary files a/public/images/pokemon/variant/exp/696_3.png and b/public/images/pokemon/variant/exp/696_3.png differ diff --git a/public/images/pokemon/variant/exp/729_2.png b/public/images/pokemon/variant/exp/729_2.png new file mode 100644 index 00000000000..c5c309dbaee Binary files /dev/null and b/public/images/pokemon/variant/exp/729_2.png differ diff --git a/public/images/pokemon/variant/exp/729_3.png b/public/images/pokemon/variant/exp/729_3.png new file mode 100644 index 00000000000..75a11c74cdc Binary files /dev/null and b/public/images/pokemon/variant/exp/729_3.png differ diff --git a/public/images/pokemon/variant/exp/747_2.png b/public/images/pokemon/variant/exp/747_2.png new file mode 100644 index 00000000000..cf3832c9236 Binary files /dev/null and b/public/images/pokemon/variant/exp/747_2.png differ diff --git a/public/images/pokemon/variant/exp/747_3.png b/public/images/pokemon/variant/exp/747_3.png new file mode 100644 index 00000000000..9fd3b92aa3e Binary files /dev/null and b/public/images/pokemon/variant/exp/747_3.png differ diff --git a/public/images/pokemon/variant/exp/754_2.png b/public/images/pokemon/variant/exp/754_2.png new file mode 100644 index 00000000000..fc7e9eadac6 Binary files /dev/null and b/public/images/pokemon/variant/exp/754_2.png differ diff --git a/public/images/pokemon/variant/exp/754_3.png b/public/images/pokemon/variant/exp/754_3.png new file mode 100644 index 00000000000..c9ad7c5d4ca Binary files /dev/null and b/public/images/pokemon/variant/exp/754_3.png differ diff --git a/public/images/pokemon/variant/exp/862_2.png b/public/images/pokemon/variant/exp/862_2.png new file mode 100644 index 00000000000..1ed022bfdf7 Binary files /dev/null and b/public/images/pokemon/variant/exp/862_2.png differ diff --git a/public/images/pokemon/variant/exp/862_3.png b/public/images/pokemon/variant/exp/862_3.png new file mode 100644 index 00000000000..79fb464d72f Binary files /dev/null and b/public/images/pokemon/variant/exp/862_3.png differ diff --git a/public/images/pokemon/variant/exp/890-eternamax_2.png b/public/images/pokemon/variant/exp/890-eternamax_2.png new file mode 100644 index 00000000000..b234ec88e16 Binary files /dev/null and b/public/images/pokemon/variant/exp/890-eternamax_2.png differ diff --git a/public/images/pokemon/variant/exp/890-eternamax_3.png b/public/images/pokemon/variant/exp/890-eternamax_3.png new file mode 100644 index 00000000000..f24e74283c5 Binary files /dev/null and b/public/images/pokemon/variant/exp/890-eternamax_3.png differ diff --git a/public/images/pokemon/variant/exp/890_2.png b/public/images/pokemon/variant/exp/890_2.png index 46d2a4590a4..036ee01f676 100644 Binary files a/public/images/pokemon/variant/exp/890_2.png and b/public/images/pokemon/variant/exp/890_2.png differ diff --git a/public/images/pokemon/variant/exp/890_3.png b/public/images/pokemon/variant/exp/890_3.png index 635272e7e17..fb757ecc5cd 100644 Binary files a/public/images/pokemon/variant/exp/890_3.png and b/public/images/pokemon/variant/exp/890_3.png differ diff --git a/public/images/pokemon/variant/exp/932_2.png b/public/images/pokemon/variant/exp/932_2.png index 9cb13ff2214..a2a7cf26909 100644 Binary files a/public/images/pokemon/variant/exp/932_2.png and b/public/images/pokemon/variant/exp/932_2.png differ diff --git a/public/images/pokemon/variant/exp/932_3.png b/public/images/pokemon/variant/exp/932_3.png index b032aa2c3d4..9b845de8fd5 100644 Binary files a/public/images/pokemon/variant/exp/932_3.png and b/public/images/pokemon/variant/exp/932_3.png differ diff --git a/public/images/pokemon/variant/exp/935_1.png b/public/images/pokemon/variant/exp/935_1.png new file mode 100644 index 00000000000..06c09657444 Binary files /dev/null and b/public/images/pokemon/variant/exp/935_1.png differ diff --git a/public/images/pokemon/variant/exp/935_2.png b/public/images/pokemon/variant/exp/935_2.png new file mode 100644 index 00000000000..87d88ad2a74 Binary files /dev/null and b/public/images/pokemon/variant/exp/935_2.png differ diff --git a/public/images/pokemon/variant/exp/935_3.png b/public/images/pokemon/variant/exp/935_3.png index 0ea2db0349d..2ffcbac799e 100644 Binary files a/public/images/pokemon/variant/exp/935_3.png and b/public/images/pokemon/variant/exp/935_3.png differ diff --git a/public/images/pokemon/variant/exp/936_1.png b/public/images/pokemon/variant/exp/936_1.png index 0b0a28f9b34..980f82162ec 100644 Binary files a/public/images/pokemon/variant/exp/936_1.png and b/public/images/pokemon/variant/exp/936_1.png differ diff --git a/public/images/pokemon/variant/exp/936_2.png b/public/images/pokemon/variant/exp/936_2.png index 0ad8ea7458c..4d5bfb25268 100644 Binary files a/public/images/pokemon/variant/exp/936_2.png and b/public/images/pokemon/variant/exp/936_2.png differ diff --git a/public/images/pokemon/variant/exp/936_3.png b/public/images/pokemon/variant/exp/936_3.png index 082930d6188..9a9b984a6ab 100644 Binary files a/public/images/pokemon/variant/exp/936_3.png and b/public/images/pokemon/variant/exp/936_3.png differ diff --git a/public/images/pokemon/variant/exp/937_1.png b/public/images/pokemon/variant/exp/937_1.png index 22f4400c8fc..53fff3c074b 100644 Binary files a/public/images/pokemon/variant/exp/937_1.png and b/public/images/pokemon/variant/exp/937_1.png differ diff --git a/public/images/pokemon/variant/exp/937_2.png b/public/images/pokemon/variant/exp/937_2.png index 49fe45e945b..af4a9c79eee 100644 Binary files a/public/images/pokemon/variant/exp/937_2.png and b/public/images/pokemon/variant/exp/937_2.png differ diff --git a/public/images/pokemon/variant/exp/937_3.png b/public/images/pokemon/variant/exp/937_3.png index 9e93d4f9a70..5917cc01076 100644 Binary files a/public/images/pokemon/variant/exp/937_3.png and b/public/images/pokemon/variant/exp/937_3.png differ diff --git a/public/images/pokemon/variant/exp/back/212-mega_2.png b/public/images/pokemon/variant/exp/back/212-mega_2.png new file mode 100644 index 00000000000..d4337df3477 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/212-mega_2.png differ diff --git a/public/images/pokemon/variant/exp/back/212-mega_3.png b/public/images/pokemon/variant/exp/back/212-mega_3.png new file mode 100644 index 00000000000..173fb44c257 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/212-mega_3.png differ diff --git a/public/images/pokemon/variant/exp/back/282-mega_2.png b/public/images/pokemon/variant/exp/back/282-mega_2.png new file mode 100644 index 00000000000..93a94a341b4 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/282-mega_2.png differ diff --git a/public/images/pokemon/variant/exp/back/282-mega_3.png b/public/images/pokemon/variant/exp/back/282-mega_3.png new file mode 100644 index 00000000000..1fdb242d937 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/282-mega_3.png differ diff --git a/public/images/pokemon/variant/exp/back/475-mega_2.png b/public/images/pokemon/variant/exp/back/475-mega_2.png index 452698c83f6..2dd2c6c25bf 100644 Binary files a/public/images/pokemon/variant/exp/back/475-mega_2.png and b/public/images/pokemon/variant/exp/back/475-mega_2.png differ diff --git a/public/images/pokemon/variant/exp/back/475-mega_3.png b/public/images/pokemon/variant/exp/back/475-mega_3.png index b8a9bffb41d..2992c010d0b 100644 Binary files a/public/images/pokemon/variant/exp/back/475-mega_3.png and b/public/images/pokemon/variant/exp/back/475-mega_3.png differ diff --git a/public/images/pokemon/variant/exp/back/696_1.png b/public/images/pokemon/variant/exp/back/696_1.png index 4725c83e46a..daae82216a5 100644 Binary files a/public/images/pokemon/variant/exp/back/696_1.png and b/public/images/pokemon/variant/exp/back/696_1.png differ diff --git a/public/images/pokemon/variant/exp/back/696_2.png b/public/images/pokemon/variant/exp/back/696_2.png index 34c30ad2e42..a8183d3c396 100644 Binary files a/public/images/pokemon/variant/exp/back/696_2.png and b/public/images/pokemon/variant/exp/back/696_2.png differ diff --git a/public/images/pokemon/variant/exp/back/696_3.png b/public/images/pokemon/variant/exp/back/696_3.png index 6718e5995e5..1eef16f0612 100644 Binary files a/public/images/pokemon/variant/exp/back/696_3.png and b/public/images/pokemon/variant/exp/back/696_3.png differ diff --git a/public/images/pokemon/variant/exp/back/729_2.png b/public/images/pokemon/variant/exp/back/729_2.png index 9aa0b00a7cf..1f2e8f31e2a 100644 Binary files a/public/images/pokemon/variant/exp/back/729_2.png and b/public/images/pokemon/variant/exp/back/729_2.png differ diff --git a/public/images/pokemon/variant/exp/back/729_3.png b/public/images/pokemon/variant/exp/back/729_3.png index 811daaa0e1b..08eb10257e1 100644 Binary files a/public/images/pokemon/variant/exp/back/729_3.png and b/public/images/pokemon/variant/exp/back/729_3.png differ diff --git a/public/images/pokemon/variant/exp/back/747_2.png b/public/images/pokemon/variant/exp/back/747_2.png index 3307b34a3d0..50f44c0def7 100644 Binary files a/public/images/pokemon/variant/exp/back/747_2.png and b/public/images/pokemon/variant/exp/back/747_2.png differ diff --git a/public/images/pokemon/variant/exp/back/747_3.png b/public/images/pokemon/variant/exp/back/747_3.png index d6a1d0d6b26..2fb8e6036b9 100644 Binary files a/public/images/pokemon/variant/exp/back/747_3.png and b/public/images/pokemon/variant/exp/back/747_3.png differ diff --git a/public/images/pokemon/variant/exp/back/754_2.png b/public/images/pokemon/variant/exp/back/754_2.png new file mode 100644 index 00000000000..63f7486da1c Binary files /dev/null and b/public/images/pokemon/variant/exp/back/754_2.png differ diff --git a/public/images/pokemon/variant/exp/back/862_2.png b/public/images/pokemon/variant/exp/back/862_2.png new file mode 100644 index 00000000000..fae2900c566 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/862_2.png differ diff --git a/public/images/pokemon/variant/exp/back/862_3.png b/public/images/pokemon/variant/exp/back/862_3.png new file mode 100644 index 00000000000..3f4537474f5 Binary files /dev/null and b/public/images/pokemon/variant/exp/back/862_3.png differ diff --git a/public/images/pokemon/variant/exp/back/935_1.png b/public/images/pokemon/variant/exp/back/935_1.png index 47bad1c3afb..6f98dfa371e 100644 Binary files a/public/images/pokemon/variant/exp/back/935_1.png and b/public/images/pokemon/variant/exp/back/935_1.png differ diff --git a/public/images/pokemon/variant/exp/back/935_2.png b/public/images/pokemon/variant/exp/back/935_2.png index 82c95b2c81a..08789758184 100644 Binary files a/public/images/pokemon/variant/exp/back/935_2.png and b/public/images/pokemon/variant/exp/back/935_2.png differ diff --git a/public/images/pokemon/variant/exp/back/935_3.png b/public/images/pokemon/variant/exp/back/935_3.png index 0787cd038cb..e58a17ead33 100644 Binary files a/public/images/pokemon/variant/exp/back/935_3.png and b/public/images/pokemon/variant/exp/back/935_3.png differ diff --git a/public/images/pokemon/variant/exp/back/936_1.png b/public/images/pokemon/variant/exp/back/936_1.png index dd552ccfa24..2b9e2d533f8 100644 Binary files a/public/images/pokemon/variant/exp/back/936_1.png and b/public/images/pokemon/variant/exp/back/936_1.png differ diff --git a/public/images/pokemon/variant/exp/back/936_2.png b/public/images/pokemon/variant/exp/back/936_2.png index 90806cfe1fb..45fb506fd01 100644 Binary files a/public/images/pokemon/variant/exp/back/936_2.png and b/public/images/pokemon/variant/exp/back/936_2.png differ diff --git a/public/images/pokemon/variant/exp/back/936_3.png b/public/images/pokemon/variant/exp/back/936_3.png index d3e2aa763de..82d3c0ecb0b 100644 Binary files a/public/images/pokemon/variant/exp/back/936_3.png and b/public/images/pokemon/variant/exp/back/936_3.png differ diff --git a/public/images/pokemon/variant/exp/back/937_1.png b/public/images/pokemon/variant/exp/back/937_1.png index e9aac254c2c..c0668be0103 100644 Binary files a/public/images/pokemon/variant/exp/back/937_1.png and b/public/images/pokemon/variant/exp/back/937_1.png differ diff --git a/public/images/pokemon/variant/exp/back/937_2.png b/public/images/pokemon/variant/exp/back/937_2.png index aeee59d4bcb..f5bfd790b75 100644 Binary files a/public/images/pokemon/variant/exp/back/937_2.png and b/public/images/pokemon/variant/exp/back/937_2.png differ diff --git a/public/images/pokemon/variant/exp/back/937_3.png b/public/images/pokemon/variant/exp/back/937_3.png index 324a522b35b..c0a2be1ae0e 100644 Binary files a/public/images/pokemon/variant/exp/back/937_3.png and b/public/images/pokemon/variant/exp/back/937_3.png differ diff --git a/public/images/pokemon/variant/female/41_2.png b/public/images/pokemon/variant/female/41_2.png new file mode 100644 index 00000000000..9ef30a5e98e Binary files /dev/null and b/public/images/pokemon/variant/female/41_2.png differ diff --git a/public/images/pokemon/variant/female/41_3.png b/public/images/pokemon/variant/female/41_3.png new file mode 100644 index 00000000000..cbc73b70515 Binary files /dev/null and b/public/images/pokemon/variant/female/41_3.png differ diff --git a/public/images/pokemon/variant/female/42_2.png b/public/images/pokemon/variant/female/42_2.png new file mode 100644 index 00000000000..a8183eaf60b Binary files /dev/null and b/public/images/pokemon/variant/female/42_2.png differ diff --git a/public/images/pokemon/variant/female/42_3.png b/public/images/pokemon/variant/female/42_3.png new file mode 100644 index 00000000000..a0029ba8548 Binary files /dev/null and b/public/images/pokemon/variant/female/42_3.png differ diff --git a/public/images/pokemon/variant/icons/1/113_1.png b/public/images/pokemon/variant/icons/1/113_1.png new file mode 100644 index 00000000000..36b1728fda4 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/113_1.png differ diff --git a/public/images/pokemon/variant/icons/1/113_2.png b/public/images/pokemon/variant/icons/1/113_2.png new file mode 100644 index 00000000000..c954640e755 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/113_2.png differ diff --git a/public/images/pokemon/variant/icons/1/113_3.png b/public/images/pokemon/variant/icons/1/113_3.png new file mode 100644 index 00000000000..536e0686905 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/113_3.png differ diff --git a/public/images/pokemon/variant/icons/1/118_2.png b/public/images/pokemon/variant/icons/1/118_2.png new file mode 100644 index 00000000000..4a04afddbba Binary files /dev/null and b/public/images/pokemon/variant/icons/1/118_2.png differ diff --git a/public/images/pokemon/variant/icons/1/118_3.png b/public/images/pokemon/variant/icons/1/118_3.png new file mode 100644 index 00000000000..a1e0173d2d7 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/118_3.png differ diff --git a/public/images/pokemon/variant/icons/1/119_1.png b/public/images/pokemon/variant/icons/1/119_1.png new file mode 100644 index 00000000000..abc2f0727ae Binary files /dev/null and b/public/images/pokemon/variant/icons/1/119_1.png differ diff --git a/public/images/pokemon/variant/icons/1/119_2.png b/public/images/pokemon/variant/icons/1/119_2.png new file mode 100644 index 00000000000..37d8dee0fd6 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/119_2.png differ diff --git a/public/images/pokemon/variant/icons/1/119_3.png b/public/images/pokemon/variant/icons/1/119_3.png new file mode 100644 index 00000000000..e71c46a0291 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/119_3.png differ diff --git a/public/images/pokemon/variant/icons/1/123_1.png b/public/images/pokemon/variant/icons/1/123_1.png new file mode 100644 index 00000000000..0bc5a3f6872 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/123_1.png differ diff --git a/public/images/pokemon/variant/icons/1/123_2.png b/public/images/pokemon/variant/icons/1/123_2.png new file mode 100644 index 00000000000..08df4b1b366 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/123_2.png differ diff --git a/public/images/pokemon/variant/icons/1/123_3.png b/public/images/pokemon/variant/icons/1/123_3.png new file mode 100644 index 00000000000..95533340fad Binary files /dev/null and b/public/images/pokemon/variant/icons/1/123_3.png differ diff --git a/public/images/pokemon/variant/icons/1/125_1.png b/public/images/pokemon/variant/icons/1/125_1.png new file mode 100644 index 00000000000..61f088c7401 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/125_1.png differ diff --git a/public/images/pokemon/variant/icons/1/125_2.png b/public/images/pokemon/variant/icons/1/125_2.png new file mode 100644 index 00000000000..8cffc1df234 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/125_2.png differ diff --git a/public/images/pokemon/variant/icons/1/125_3.png b/public/images/pokemon/variant/icons/1/125_3.png new file mode 100644 index 00000000000..bb67e1a08db Binary files /dev/null and b/public/images/pokemon/variant/icons/1/125_3.png differ diff --git a/public/images/pokemon/variant/icons/1/127-mega_2.png b/public/images/pokemon/variant/icons/1/127-mega_2.png new file mode 100644 index 00000000000..a9f5e703d2c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/127-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/1/127-mega_3.png b/public/images/pokemon/variant/icons/1/127-mega_3.png new file mode 100644 index 00000000000..62b2992582d Binary files /dev/null and b/public/images/pokemon/variant/icons/1/127-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/1/127_2.png b/public/images/pokemon/variant/icons/1/127_2.png new file mode 100644 index 00000000000..8b4a0c358e6 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/127_2.png differ diff --git a/public/images/pokemon/variant/icons/1/127_3.png b/public/images/pokemon/variant/icons/1/127_3.png new file mode 100644 index 00000000000..59390f17575 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/127_3.png differ diff --git a/public/images/pokemon/variant/icons/1/131-gigantamax_2.png b/public/images/pokemon/variant/icons/1/131-gigantamax_2.png new file mode 100644 index 00000000000..6032d52a1ad Binary files /dev/null and b/public/images/pokemon/variant/icons/1/131-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/1/131-gigantamax_3.png b/public/images/pokemon/variant/icons/1/131-gigantamax_3.png new file mode 100644 index 00000000000..229d6ae864e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/131-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/1/131_2.png b/public/images/pokemon/variant/icons/1/131_2.png new file mode 100644 index 00000000000..eb7dc097a35 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/131_2.png differ diff --git a/public/images/pokemon/variant/icons/1/131_3.png b/public/images/pokemon/variant/icons/1/131_3.png new file mode 100644 index 00000000000..6a2e2436e3f Binary files /dev/null and b/public/images/pokemon/variant/icons/1/131_3.png differ diff --git a/public/images/pokemon/variant/icons/1/133_2.png b/public/images/pokemon/variant/icons/1/133_2.png new file mode 100644 index 00000000000..7ab496699f7 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/133_2.png differ diff --git a/public/images/pokemon/variant/icons/1/133_3.png b/public/images/pokemon/variant/icons/1/133_3.png new file mode 100644 index 00000000000..f999dd0fff7 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/133_3.png differ diff --git a/public/images/pokemon/variant/icons/1/134_2.png b/public/images/pokemon/variant/icons/1/134_2.png new file mode 100644 index 00000000000..9cffe29a5e9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/134_2.png differ diff --git a/public/images/pokemon/variant/icons/1/134_3.png b/public/images/pokemon/variant/icons/1/134_3.png new file mode 100644 index 00000000000..5c1c1384110 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/134_3.png differ diff --git a/public/images/pokemon/variant/icons/1/135_1.png b/public/images/pokemon/variant/icons/1/135_1.png new file mode 100644 index 00000000000..259dca57c06 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/135_1.png differ diff --git a/public/images/pokemon/variant/icons/1/135_2.png b/public/images/pokemon/variant/icons/1/135_2.png new file mode 100644 index 00000000000..3b8b864196b Binary files /dev/null and b/public/images/pokemon/variant/icons/1/135_2.png differ diff --git a/public/images/pokemon/variant/icons/1/135_3.png b/public/images/pokemon/variant/icons/1/135_3.png new file mode 100644 index 00000000000..f7f98152dfe Binary files /dev/null and b/public/images/pokemon/variant/icons/1/135_3.png differ diff --git a/public/images/pokemon/variant/icons/1/136_1.png b/public/images/pokemon/variant/icons/1/136_1.png new file mode 100644 index 00000000000..bbf577e442e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/136_1.png differ diff --git a/public/images/pokemon/variant/icons/1/136_2.png b/public/images/pokemon/variant/icons/1/136_2.png new file mode 100644 index 00000000000..78c6844c47c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/136_2.png differ diff --git a/public/images/pokemon/variant/icons/1/136_3.png b/public/images/pokemon/variant/icons/1/136_3.png new file mode 100644 index 00000000000..fc5c63dc0a2 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/136_3.png differ diff --git a/public/images/pokemon/variant/icons/1/138_2.png b/public/images/pokemon/variant/icons/1/138_2.png new file mode 100644 index 00000000000..4ebcad71b93 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/138_2.png differ diff --git a/public/images/pokemon/variant/icons/1/138_3.png b/public/images/pokemon/variant/icons/1/138_3.png new file mode 100644 index 00000000000..d66ea50a627 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/138_3.png differ diff --git a/public/images/pokemon/variant/icons/1/139_2.png b/public/images/pokemon/variant/icons/1/139_2.png new file mode 100644 index 00000000000..f3934cbe1e9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/139_2.png differ diff --git a/public/images/pokemon/variant/icons/1/139_3.png b/public/images/pokemon/variant/icons/1/139_3.png new file mode 100644 index 00000000000..58327e471f6 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/139_3.png differ diff --git a/public/images/pokemon/variant/icons/1/140_2.png b/public/images/pokemon/variant/icons/1/140_2.png new file mode 100644 index 00000000000..c0c7c8b9c4c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/140_2.png differ diff --git a/public/images/pokemon/variant/icons/1/140_3.png b/public/images/pokemon/variant/icons/1/140_3.png new file mode 100644 index 00000000000..1e2a3f740d9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/140_3.png differ diff --git a/public/images/pokemon/variant/icons/1/141_2.png b/public/images/pokemon/variant/icons/1/141_2.png new file mode 100644 index 00000000000..351f2935fbf Binary files /dev/null and b/public/images/pokemon/variant/icons/1/141_2.png differ diff --git a/public/images/pokemon/variant/icons/1/141_3.png b/public/images/pokemon/variant/icons/1/141_3.png new file mode 100644 index 00000000000..512e4b8663a Binary files /dev/null and b/public/images/pokemon/variant/icons/1/141_3.png differ diff --git a/public/images/pokemon/variant/icons/1/142-mega_2.png b/public/images/pokemon/variant/icons/1/142-mega_2.png new file mode 100644 index 00000000000..692f5114dcb Binary files /dev/null and b/public/images/pokemon/variant/icons/1/142-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/1/142-mega_3.png b/public/images/pokemon/variant/icons/1/142-mega_3.png new file mode 100644 index 00000000000..21d23365120 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/142-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/1/142_2.png b/public/images/pokemon/variant/icons/1/142_2.png new file mode 100644 index 00000000000..521fdc7ee4b Binary files /dev/null and b/public/images/pokemon/variant/icons/1/142_2.png differ diff --git a/public/images/pokemon/variant/icons/1/142_3.png b/public/images/pokemon/variant/icons/1/142_3.png new file mode 100644 index 00000000000..5ed3a1fe4ff Binary files /dev/null and b/public/images/pokemon/variant/icons/1/142_3.png differ diff --git a/public/images/pokemon/variant/icons/1/144_1.png b/public/images/pokemon/variant/icons/1/144_1.png new file mode 100644 index 00000000000..a67ae72dc05 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/144_1.png differ diff --git a/public/images/pokemon/variant/icons/1/144_2.png b/public/images/pokemon/variant/icons/1/144_2.png new file mode 100644 index 00000000000..cb73a0f3b9f Binary files /dev/null and b/public/images/pokemon/variant/icons/1/144_2.png differ diff --git a/public/images/pokemon/variant/icons/1/144_3.png b/public/images/pokemon/variant/icons/1/144_3.png new file mode 100644 index 00000000000..f330cdeb62e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/144_3.png differ diff --git a/public/images/pokemon/variant/icons/1/145_1.png b/public/images/pokemon/variant/icons/1/145_1.png new file mode 100644 index 00000000000..8bf9b8c94fd Binary files /dev/null and b/public/images/pokemon/variant/icons/1/145_1.png differ diff --git a/public/images/pokemon/variant/icons/1/145_2.png b/public/images/pokemon/variant/icons/1/145_2.png new file mode 100644 index 00000000000..4fdadb9990b Binary files /dev/null and b/public/images/pokemon/variant/icons/1/145_2.png differ diff --git a/public/images/pokemon/variant/icons/1/145_3.png b/public/images/pokemon/variant/icons/1/145_3.png new file mode 100644 index 00000000000..07502c60e22 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/145_3.png differ diff --git a/public/images/pokemon/variant/icons/1/146_1.png b/public/images/pokemon/variant/icons/1/146_1.png new file mode 100644 index 00000000000..e264b024ba9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/146_1.png differ diff --git a/public/images/pokemon/variant/icons/1/146_2.png b/public/images/pokemon/variant/icons/1/146_2.png new file mode 100644 index 00000000000..a6f78c0e917 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/146_2.png differ diff --git a/public/images/pokemon/variant/icons/1/146_3.png b/public/images/pokemon/variant/icons/1/146_3.png new file mode 100644 index 00000000000..a0c4b9656bb Binary files /dev/null and b/public/images/pokemon/variant/icons/1/146_3.png differ diff --git a/public/images/pokemon/variant/icons/1/147_2.png b/public/images/pokemon/variant/icons/1/147_2.png new file mode 100644 index 00000000000..1f66a5f5e6c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/147_2.png differ diff --git a/public/images/pokemon/variant/icons/1/147_3.png b/public/images/pokemon/variant/icons/1/147_3.png new file mode 100644 index 00000000000..9e61342b2c9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/147_3.png differ diff --git a/public/images/pokemon/variant/icons/1/148_2.png b/public/images/pokemon/variant/icons/1/148_2.png new file mode 100644 index 00000000000..0b38dd92640 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/148_2.png differ diff --git a/public/images/pokemon/variant/icons/1/148_3.png b/public/images/pokemon/variant/icons/1/148_3.png new file mode 100644 index 00000000000..e9be6110f95 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/148_3.png differ diff --git a/public/images/pokemon/variant/icons/1/149_2.png b/public/images/pokemon/variant/icons/1/149_2.png new file mode 100644 index 00000000000..5a0cab35949 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/149_2.png differ diff --git a/public/images/pokemon/variant/icons/1/149_3.png b/public/images/pokemon/variant/icons/1/149_3.png new file mode 100644 index 00000000000..3defe1c15fa Binary files /dev/null and b/public/images/pokemon/variant/icons/1/149_3.png differ diff --git a/public/images/pokemon/variant/icons/1/150_2.png b/public/images/pokemon/variant/icons/1/150_2.png new file mode 100644 index 00000000000..f2fbe81988c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/150_2.png differ diff --git a/public/images/pokemon/variant/icons/1/150_3.png b/public/images/pokemon/variant/icons/1/150_3.png new file mode 100644 index 00000000000..47742c993f4 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/150_3.png differ diff --git a/public/images/pokemon/variant/icons/1/151_2.png b/public/images/pokemon/variant/icons/1/151_2.png new file mode 100644 index 00000000000..63baee99844 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/151_2.png differ diff --git a/public/images/pokemon/variant/icons/1/151_3.png b/public/images/pokemon/variant/icons/1/151_3.png new file mode 100644 index 00000000000..1ba138538b4 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/151_3.png differ diff --git a/public/images/pokemon/variant/icons/1/1_2.png b/public/images/pokemon/variant/icons/1/1_2.png new file mode 100644 index 00000000000..03b966143a5 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/1_2.png differ diff --git a/public/images/pokemon/variant/icons/1/1_3.png b/public/images/pokemon/variant/icons/1/1_3.png new file mode 100644 index 00000000000..6fa0c416b34 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/1_3.png differ diff --git a/public/images/pokemon/variant/icons/1/29_2.png b/public/images/pokemon/variant/icons/1/29_2.png new file mode 100644 index 00000000000..12d66fb1579 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/29_2.png differ diff --git a/public/images/pokemon/variant/icons/1/29_3.png b/public/images/pokemon/variant/icons/1/29_3.png new file mode 100644 index 00000000000..c5f1f4aae94 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/29_3.png differ diff --git a/public/images/pokemon/variant/icons/1/2_2.png b/public/images/pokemon/variant/icons/1/2_2.png new file mode 100644 index 00000000000..f9fc69a4756 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/2_2.png differ diff --git a/public/images/pokemon/variant/icons/1/2_3.png b/public/images/pokemon/variant/icons/1/2_3.png new file mode 100644 index 00000000000..0ba316759b6 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/2_3.png differ diff --git a/public/images/pokemon/variant/icons/1/3-gigantamax_2.png b/public/images/pokemon/variant/icons/1/3-gigantamax_2.png new file mode 100644 index 00000000000..71db40e400e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/3-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/1/3-gigantamax_3.png b/public/images/pokemon/variant/icons/1/3-gigantamax_3.png new file mode 100644 index 00000000000..caa9477dfe2 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/3-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/1/3-mega_2.png b/public/images/pokemon/variant/icons/1/3-mega_2.png new file mode 100644 index 00000000000..33664417a54 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/3-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/1/3-mega_3.png b/public/images/pokemon/variant/icons/1/3-mega_3.png new file mode 100644 index 00000000000..529740cfccc Binary files /dev/null and b/public/images/pokemon/variant/icons/1/3-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/1/30_2.png b/public/images/pokemon/variant/icons/1/30_2.png new file mode 100644 index 00000000000..29e97832b44 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/30_2.png differ diff --git a/public/images/pokemon/variant/icons/1/30_3.png b/public/images/pokemon/variant/icons/1/30_3.png new file mode 100644 index 00000000000..5d292322fee Binary files /dev/null and b/public/images/pokemon/variant/icons/1/30_3.png differ diff --git a/public/images/pokemon/variant/icons/1/31_1.png b/public/images/pokemon/variant/icons/1/31_1.png new file mode 100644 index 00000000000..51ab04f75f6 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/31_1.png differ diff --git a/public/images/pokemon/variant/icons/1/31_2.png b/public/images/pokemon/variant/icons/1/31_2.png new file mode 100644 index 00000000000..709a6e7bbbf Binary files /dev/null and b/public/images/pokemon/variant/icons/1/31_2.png differ diff --git a/public/images/pokemon/variant/icons/1/31_3.png b/public/images/pokemon/variant/icons/1/31_3.png new file mode 100644 index 00000000000..020c42185e9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/31_3.png differ diff --git a/public/images/pokemon/variant/icons/1/35_2.png b/public/images/pokemon/variant/icons/1/35_2.png new file mode 100644 index 00000000000..3a2914fcbf9 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/35_2.png differ diff --git a/public/images/pokemon/variant/icons/1/35_3.png b/public/images/pokemon/variant/icons/1/35_3.png new file mode 100644 index 00000000000..e6f4fb4f527 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/35_3.png differ diff --git a/public/images/pokemon/variant/icons/1/36_2.png b/public/images/pokemon/variant/icons/1/36_2.png new file mode 100644 index 00000000000..47211bebbba Binary files /dev/null and b/public/images/pokemon/variant/icons/1/36_2.png differ diff --git a/public/images/pokemon/variant/icons/1/36_3.png b/public/images/pokemon/variant/icons/1/36_3.png new file mode 100644 index 00000000000..159deb7ac9c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/36_3.png differ diff --git a/public/images/pokemon/variant/icons/1/3_2.png b/public/images/pokemon/variant/icons/1/3_2.png new file mode 100644 index 00000000000..42f3828a8f3 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/3_2.png differ diff --git a/public/images/pokemon/variant/icons/1/3_3.png b/public/images/pokemon/variant/icons/1/3_3.png new file mode 100644 index 00000000000..dc29fbd74d4 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/3_3.png differ diff --git a/public/images/pokemon/variant/icons/1/41_1.png b/public/images/pokemon/variant/icons/1/41_1.png new file mode 100644 index 00000000000..a5b99e23d6b Binary files /dev/null and b/public/images/pokemon/variant/icons/1/41_1.png differ diff --git a/public/images/pokemon/variant/icons/1/41_2.png b/public/images/pokemon/variant/icons/1/41_2.png new file mode 100644 index 00000000000..c73a279ff4d Binary files /dev/null and b/public/images/pokemon/variant/icons/1/41_2.png differ diff --git a/public/images/pokemon/variant/icons/1/41_3.png b/public/images/pokemon/variant/icons/1/41_3.png new file mode 100644 index 00000000000..e82afadc93d Binary files /dev/null and b/public/images/pokemon/variant/icons/1/41_3.png differ diff --git a/public/images/pokemon/variant/icons/1/42_1.png b/public/images/pokemon/variant/icons/1/42_1.png new file mode 100644 index 00000000000..713ff4dce46 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/42_1.png differ diff --git a/public/images/pokemon/variant/icons/1/42_2.png b/public/images/pokemon/variant/icons/1/42_2.png new file mode 100644 index 00000000000..2ecf6caa41e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/42_2.png differ diff --git a/public/images/pokemon/variant/icons/1/42_3.png b/public/images/pokemon/variant/icons/1/42_3.png new file mode 100644 index 00000000000..7975ca4b1f6 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/42_3.png differ diff --git a/public/images/pokemon/variant/icons/1/46_1.png b/public/images/pokemon/variant/icons/1/46_1.png new file mode 100644 index 00000000000..6f29d16ed7d Binary files /dev/null and b/public/images/pokemon/variant/icons/1/46_1.png differ diff --git a/public/images/pokemon/variant/icons/1/46_2.png b/public/images/pokemon/variant/icons/1/46_2.png new file mode 100644 index 00000000000..45bd33c6230 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/46_2.png differ diff --git a/public/images/pokemon/variant/icons/1/46_3.png b/public/images/pokemon/variant/icons/1/46_3.png new file mode 100644 index 00000000000..c2a0e958745 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/46_3.png differ diff --git a/public/images/pokemon/variant/icons/1/47_1.png b/public/images/pokemon/variant/icons/1/47_1.png new file mode 100644 index 00000000000..6dfafffe8de Binary files /dev/null and b/public/images/pokemon/variant/icons/1/47_1.png differ diff --git a/public/images/pokemon/variant/icons/1/47_2.png b/public/images/pokemon/variant/icons/1/47_2.png new file mode 100644 index 00000000000..193a3e786fb Binary files /dev/null and b/public/images/pokemon/variant/icons/1/47_2.png differ diff --git a/public/images/pokemon/variant/icons/1/47_3.png b/public/images/pokemon/variant/icons/1/47_3.png new file mode 100644 index 00000000000..6a19f28aab5 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/47_3.png differ diff --git a/public/images/pokemon/variant/icons/1/50_2.png b/public/images/pokemon/variant/icons/1/50_2.png new file mode 100644 index 00000000000..f5d80fa0a98 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/50_2.png differ diff --git a/public/images/pokemon/variant/icons/1/50_3.png b/public/images/pokemon/variant/icons/1/50_3.png new file mode 100644 index 00000000000..05d01766e24 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/50_3.png differ diff --git a/public/images/pokemon/variant/icons/1/51_2.png b/public/images/pokemon/variant/icons/1/51_2.png new file mode 100644 index 00000000000..23a34ae4ca8 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/51_2.png differ diff --git a/public/images/pokemon/variant/icons/1/51_3.png b/public/images/pokemon/variant/icons/1/51_3.png new file mode 100644 index 00000000000..63a57aaa17e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/51_3.png differ diff --git a/public/images/pokemon/variant/icons/1/52-gigantamax_1.png b/public/images/pokemon/variant/icons/1/52-gigantamax_1.png new file mode 100644 index 00000000000..b5a46b1af7a Binary files /dev/null and b/public/images/pokemon/variant/icons/1/52-gigantamax_1.png differ diff --git a/public/images/pokemon/variant/icons/1/52-gigantamax_2.png b/public/images/pokemon/variant/icons/1/52-gigantamax_2.png new file mode 100644 index 00000000000..657f44d5b27 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/52-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/1/52-gigantamax_3.png b/public/images/pokemon/variant/icons/1/52-gigantamax_3.png new file mode 100644 index 00000000000..a61ef7f1f3a Binary files /dev/null and b/public/images/pokemon/variant/icons/1/52-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/1/52_1.png b/public/images/pokemon/variant/icons/1/52_1.png new file mode 100644 index 00000000000..b8fd1ea80c8 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/52_1.png differ diff --git a/public/images/pokemon/variant/icons/1/52_2.png b/public/images/pokemon/variant/icons/1/52_2.png new file mode 100644 index 00000000000..4ba9daced0a Binary files /dev/null and b/public/images/pokemon/variant/icons/1/52_2.png differ diff --git a/public/images/pokemon/variant/icons/1/52_3.png b/public/images/pokemon/variant/icons/1/52_3.png new file mode 100644 index 00000000000..ed9e423096b Binary files /dev/null and b/public/images/pokemon/variant/icons/1/52_3.png differ diff --git a/public/images/pokemon/variant/icons/1/53_1.png b/public/images/pokemon/variant/icons/1/53_1.png new file mode 100644 index 00000000000..bcd50545860 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/53_1.png differ diff --git a/public/images/pokemon/variant/icons/1/53_2.png b/public/images/pokemon/variant/icons/1/53_2.png new file mode 100644 index 00000000000..337b037b9c8 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/53_2.png differ diff --git a/public/images/pokemon/variant/icons/1/53_3.png b/public/images/pokemon/variant/icons/1/53_3.png new file mode 100644 index 00000000000..749bac6b911 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/53_3.png differ diff --git a/public/images/pokemon/variant/icons/1/69_2.png b/public/images/pokemon/variant/icons/1/69_2.png new file mode 100644 index 00000000000..6924dccf989 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/69_2.png differ diff --git a/public/images/pokemon/variant/icons/1/69_3.png b/public/images/pokemon/variant/icons/1/69_3.png new file mode 100644 index 00000000000..87b86a7cbeb Binary files /dev/null and b/public/images/pokemon/variant/icons/1/69_3.png differ diff --git a/public/images/pokemon/variant/icons/1/70_2.png b/public/images/pokemon/variant/icons/1/70_2.png new file mode 100644 index 00000000000..6095f7032af Binary files /dev/null and b/public/images/pokemon/variant/icons/1/70_2.png differ diff --git a/public/images/pokemon/variant/icons/1/70_3.png b/public/images/pokemon/variant/icons/1/70_3.png new file mode 100644 index 00000000000..4c1d563931e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/70_3.png differ diff --git a/public/images/pokemon/variant/icons/1/71_2.png b/public/images/pokemon/variant/icons/1/71_2.png new file mode 100644 index 00000000000..4cac71faaf7 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/71_2.png differ diff --git a/public/images/pokemon/variant/icons/1/71_3.png b/public/images/pokemon/variant/icons/1/71_3.png new file mode 100644 index 00000000000..6eda69191fd Binary files /dev/null and b/public/images/pokemon/variant/icons/1/71_3.png differ diff --git a/public/images/pokemon/variant/icons/1/7_2.png b/public/images/pokemon/variant/icons/1/7_2.png new file mode 100644 index 00000000000..5e784bf6a06 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/7_2.png differ diff --git a/public/images/pokemon/variant/icons/1/7_3.png b/public/images/pokemon/variant/icons/1/7_3.png new file mode 100644 index 00000000000..23b5c38cb94 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/7_3.png differ diff --git a/public/images/pokemon/variant/icons/1/83_2.png b/public/images/pokemon/variant/icons/1/83_2.png new file mode 100644 index 00000000000..7ad8070e016 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/83_2.png differ diff --git a/public/images/pokemon/variant/icons/1/83_3.png b/public/images/pokemon/variant/icons/1/83_3.png new file mode 100644 index 00000000000..d2ddf78079e Binary files /dev/null and b/public/images/pokemon/variant/icons/1/83_3.png differ diff --git a/public/images/pokemon/variant/icons/1/86_1.png b/public/images/pokemon/variant/icons/1/86_1.png new file mode 100644 index 00000000000..33032e875bd Binary files /dev/null and b/public/images/pokemon/variant/icons/1/86_1.png differ diff --git a/public/images/pokemon/variant/icons/1/86_2.png b/public/images/pokemon/variant/icons/1/86_2.png new file mode 100644 index 00000000000..e6495963b07 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/86_2.png differ diff --git a/public/images/pokemon/variant/icons/1/86_3.png b/public/images/pokemon/variant/icons/1/86_3.png new file mode 100644 index 00000000000..7ab2eecbe79 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/86_3.png differ diff --git a/public/images/pokemon/variant/icons/1/87_1.png b/public/images/pokemon/variant/icons/1/87_1.png new file mode 100644 index 00000000000..ddeeec97b98 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/87_1.png differ diff --git a/public/images/pokemon/variant/icons/1/87_2.png b/public/images/pokemon/variant/icons/1/87_2.png new file mode 100644 index 00000000000..2631944bbe0 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/87_2.png differ diff --git a/public/images/pokemon/variant/icons/1/87_3.png b/public/images/pokemon/variant/icons/1/87_3.png new file mode 100644 index 00000000000..a53c4e6830c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/87_3.png differ diff --git a/public/images/pokemon/variant/icons/1/8_2.png b/public/images/pokemon/variant/icons/1/8_2.png new file mode 100644 index 00000000000..6474c98bbda Binary files /dev/null and b/public/images/pokemon/variant/icons/1/8_2.png differ diff --git a/public/images/pokemon/variant/icons/1/8_3.png b/public/images/pokemon/variant/icons/1/8_3.png new file mode 100644 index 00000000000..7eda6afd272 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/8_3.png differ diff --git a/public/images/pokemon/variant/icons/1/9-gigantamax_2.png b/public/images/pokemon/variant/icons/1/9-gigantamax_2.png new file mode 100644 index 00000000000..9b0525f73e3 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/9-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/1/9-gigantamax_3.png b/public/images/pokemon/variant/icons/1/9-gigantamax_3.png new file mode 100644 index 00000000000..61b0b406149 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/9-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/1/9-mega_2.png b/public/images/pokemon/variant/icons/1/9-mega_2.png new file mode 100644 index 00000000000..43bd581bf85 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/9-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/1/9-mega_3.png b/public/images/pokemon/variant/icons/1/9-mega_3.png new file mode 100644 index 00000000000..e8097fb2665 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/9-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/1/92_1.png b/public/images/pokemon/variant/icons/1/92_1.png new file mode 100644 index 00000000000..630edf8dd65 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/92_1.png differ diff --git a/public/images/pokemon/variant/icons/1/92_2.png b/public/images/pokemon/variant/icons/1/92_2.png new file mode 100644 index 00000000000..bcfd934e262 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/92_2.png differ diff --git a/public/images/pokemon/variant/icons/1/92_3.png b/public/images/pokemon/variant/icons/1/92_3.png new file mode 100644 index 00000000000..2a63286ab71 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/92_3.png differ diff --git a/public/images/pokemon/variant/icons/1/93_1.png b/public/images/pokemon/variant/icons/1/93_1.png new file mode 100644 index 00000000000..6b234888e7c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/93_1.png differ diff --git a/public/images/pokemon/variant/icons/1/93_2.png b/public/images/pokemon/variant/icons/1/93_2.png new file mode 100644 index 00000000000..bbac824bb92 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/93_2.png differ diff --git a/public/images/pokemon/variant/icons/1/93_3.png b/public/images/pokemon/variant/icons/1/93_3.png new file mode 100644 index 00000000000..f8dda577d8a Binary files /dev/null and b/public/images/pokemon/variant/icons/1/93_3.png differ diff --git a/public/images/pokemon/variant/icons/1/94-gigantamax_1.png b/public/images/pokemon/variant/icons/1/94-gigantamax_1.png new file mode 100644 index 00000000000..44410e1bb6b Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94-gigantamax_1.png differ diff --git a/public/images/pokemon/variant/icons/1/94-gigantamax_2.png b/public/images/pokemon/variant/icons/1/94-gigantamax_2.png new file mode 100644 index 00000000000..c48eaa9bc3c Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/1/94-gigantamax_3.png b/public/images/pokemon/variant/icons/1/94-gigantamax_3.png new file mode 100644 index 00000000000..19f9ca86395 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/1/94-mega_1.png b/public/images/pokemon/variant/icons/1/94-mega_1.png new file mode 100644 index 00000000000..8be3900458d Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94-mega_1.png differ diff --git a/public/images/pokemon/variant/icons/1/94-mega_2.png b/public/images/pokemon/variant/icons/1/94-mega_2.png new file mode 100644 index 00000000000..07306aec370 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/1/94-mega_3.png b/public/images/pokemon/variant/icons/1/94-mega_3.png new file mode 100644 index 00000000000..dca0a75b535 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/1/94_1.png b/public/images/pokemon/variant/icons/1/94_1.png new file mode 100644 index 00000000000..53589398a5a Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94_1.png differ diff --git a/public/images/pokemon/variant/icons/1/94_2.png b/public/images/pokemon/variant/icons/1/94_2.png new file mode 100644 index 00000000000..e4f015c6604 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94_2.png differ diff --git a/public/images/pokemon/variant/icons/1/94_3.png b/public/images/pokemon/variant/icons/1/94_3.png new file mode 100644 index 00000000000..b5809b798c4 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/94_3.png differ diff --git a/public/images/pokemon/variant/icons/1/9_2.png b/public/images/pokemon/variant/icons/1/9_2.png new file mode 100644 index 00000000000..86f283ccf05 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/9_2.png differ diff --git a/public/images/pokemon/variant/icons/1/9_3.png b/public/images/pokemon/variant/icons/1/9_3.png new file mode 100644 index 00000000000..b8facd38ae8 Binary files /dev/null and b/public/images/pokemon/variant/icons/1/9_3.png differ diff --git a/public/images/pokemon/variant/icons/2/169_1.png b/public/images/pokemon/variant/icons/2/169_1.png new file mode 100644 index 00000000000..5d27b5a5b00 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/169_1.png differ diff --git a/public/images/pokemon/variant/icons/2/169_2.png b/public/images/pokemon/variant/icons/2/169_2.png new file mode 100644 index 00000000000..48b0dfb09fc Binary files /dev/null and b/public/images/pokemon/variant/icons/2/169_2.png differ diff --git a/public/images/pokemon/variant/icons/2/169_3.png b/public/images/pokemon/variant/icons/2/169_3.png new file mode 100644 index 00000000000..86f8ddd9b74 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/169_3.png differ diff --git a/public/images/pokemon/variant/icons/2/173_2.png b/public/images/pokemon/variant/icons/2/173_2.png new file mode 100644 index 00000000000..cdd5d978554 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/173_2.png differ diff --git a/public/images/pokemon/variant/icons/2/175_1.png b/public/images/pokemon/variant/icons/2/175_1.png new file mode 100644 index 00000000000..3908363e380 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/175_1.png differ diff --git a/public/images/pokemon/variant/icons/2/175_2.png b/public/images/pokemon/variant/icons/2/175_2.png new file mode 100644 index 00000000000..b602ce368b8 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/175_2.png differ diff --git a/public/images/pokemon/variant/icons/2/175_3.png b/public/images/pokemon/variant/icons/2/175_3.png new file mode 100644 index 00000000000..842cb52abfc Binary files /dev/null and b/public/images/pokemon/variant/icons/2/175_3.png differ diff --git a/public/images/pokemon/variant/icons/2/176_1.png b/public/images/pokemon/variant/icons/2/176_1.png new file mode 100644 index 00000000000..e51a7a45c3c Binary files /dev/null and b/public/images/pokemon/variant/icons/2/176_1.png differ diff --git a/public/images/pokemon/variant/icons/2/176_2.png b/public/images/pokemon/variant/icons/2/176_2.png new file mode 100644 index 00000000000..22df84f66e1 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/176_2.png differ diff --git a/public/images/pokemon/variant/icons/2/176_3.png b/public/images/pokemon/variant/icons/2/176_3.png new file mode 100644 index 00000000000..5663e2bbf51 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/176_3.png differ diff --git a/public/images/pokemon/variant/icons/2/179_2.png b/public/images/pokemon/variant/icons/2/179_2.png new file mode 100644 index 00000000000..3edfe9fd44e Binary files /dev/null and b/public/images/pokemon/variant/icons/2/179_2.png differ diff --git a/public/images/pokemon/variant/icons/2/179_3.png b/public/images/pokemon/variant/icons/2/179_3.png new file mode 100644 index 00000000000..6a93e4d9ed7 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/179_3.png differ diff --git a/public/images/pokemon/variant/icons/2/180_2.png b/public/images/pokemon/variant/icons/2/180_2.png new file mode 100644 index 00000000000..45b2e052738 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/180_2.png differ diff --git a/public/images/pokemon/variant/icons/2/180_3.png b/public/images/pokemon/variant/icons/2/180_3.png new file mode 100644 index 00000000000..c3c7278a8fd Binary files /dev/null and b/public/images/pokemon/variant/icons/2/180_3.png differ diff --git a/public/images/pokemon/variant/icons/2/181-mega_2.png b/public/images/pokemon/variant/icons/2/181-mega_2.png new file mode 100644 index 00000000000..69619852229 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/181-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/2/181-mega_3.png b/public/images/pokemon/variant/icons/2/181-mega_3.png new file mode 100644 index 00000000000..94c351a8093 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/181-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/2/181_2.png b/public/images/pokemon/variant/icons/2/181_2.png new file mode 100644 index 00000000000..246ccf2f753 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/181_2.png differ diff --git a/public/images/pokemon/variant/icons/2/181_3.png b/public/images/pokemon/variant/icons/2/181_3.png new file mode 100644 index 00000000000..fb087c93669 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/181_3.png differ diff --git a/public/images/pokemon/variant/icons/2/183_2.png b/public/images/pokemon/variant/icons/2/183_2.png new file mode 100644 index 00000000000..85d0e27c1fd Binary files /dev/null and b/public/images/pokemon/variant/icons/2/183_2.png differ diff --git a/public/images/pokemon/variant/icons/2/183_3.png b/public/images/pokemon/variant/icons/2/183_3.png new file mode 100644 index 00000000000..eb5cf58d247 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/183_3.png differ diff --git a/public/images/pokemon/variant/icons/2/184_2.png b/public/images/pokemon/variant/icons/2/184_2.png new file mode 100644 index 00000000000..6244dde636a Binary files /dev/null and b/public/images/pokemon/variant/icons/2/184_2.png differ diff --git a/public/images/pokemon/variant/icons/2/184_3.png b/public/images/pokemon/variant/icons/2/184_3.png new file mode 100644 index 00000000000..8bbddd75f79 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/184_3.png differ diff --git a/public/images/pokemon/variant/icons/2/196_1.png b/public/images/pokemon/variant/icons/2/196_1.png new file mode 100644 index 00000000000..720839e6852 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/196_1.png differ diff --git a/public/images/pokemon/variant/icons/2/196_2.png b/public/images/pokemon/variant/icons/2/196_2.png new file mode 100644 index 00000000000..e67145e663f Binary files /dev/null and b/public/images/pokemon/variant/icons/2/196_2.png differ diff --git a/public/images/pokemon/variant/icons/2/196_3.png b/public/images/pokemon/variant/icons/2/196_3.png new file mode 100644 index 00000000000..7a7254f30f5 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/196_3.png differ diff --git a/public/images/pokemon/variant/icons/2/197_2.png b/public/images/pokemon/variant/icons/2/197_2.png new file mode 100644 index 00000000000..af71d57d4d6 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/197_2.png differ diff --git a/public/images/pokemon/variant/icons/2/197_3.png b/public/images/pokemon/variant/icons/2/197_3.png new file mode 100644 index 00000000000..d411e501061 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/197_3.png differ diff --git a/public/images/pokemon/variant/icons/2/200_1.png b/public/images/pokemon/variant/icons/2/200_1.png new file mode 100644 index 00000000000..675b37bf5b3 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/200_1.png differ diff --git a/public/images/pokemon/variant/icons/2/200_2.png b/public/images/pokemon/variant/icons/2/200_2.png new file mode 100644 index 00000000000..3e269f2ed79 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/200_2.png differ diff --git a/public/images/pokemon/variant/icons/2/200_3.png b/public/images/pokemon/variant/icons/2/200_3.png new file mode 100644 index 00000000000..82a7ea6c5d9 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/200_3.png differ diff --git a/public/images/pokemon/variant/icons/2/212-mega_1.png b/public/images/pokemon/variant/icons/2/212-mega_1.png new file mode 100644 index 00000000000..53bc17210d1 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/212-mega_1.png differ diff --git a/public/images/pokemon/variant/icons/2/212-mega_2.png b/public/images/pokemon/variant/icons/2/212-mega_2.png new file mode 100644 index 00000000000..3ad0313c637 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/212-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/2/212-mega_3.png b/public/images/pokemon/variant/icons/2/212-mega_3.png new file mode 100644 index 00000000000..4b2754eda64 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/212-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/2/212_1.png b/public/images/pokemon/variant/icons/2/212_1.png new file mode 100644 index 00000000000..e465191ec6b Binary files /dev/null and b/public/images/pokemon/variant/icons/2/212_1.png differ diff --git a/public/images/pokemon/variant/icons/2/212_2.png b/public/images/pokemon/variant/icons/2/212_2.png new file mode 100644 index 00000000000..a266908d132 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/212_2.png differ diff --git a/public/images/pokemon/variant/icons/2/212_3.png b/public/images/pokemon/variant/icons/2/212_3.png new file mode 100644 index 00000000000..238baec2bf9 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/212_3.png differ diff --git a/public/images/pokemon/variant/icons/2/216_1.png b/public/images/pokemon/variant/icons/2/216_1.png new file mode 100644 index 00000000000..576aa7bb06c Binary files /dev/null and b/public/images/pokemon/variant/icons/2/216_1.png differ diff --git a/public/images/pokemon/variant/icons/2/216_2.png b/public/images/pokemon/variant/icons/2/216_2.png new file mode 100644 index 00000000000..0c834a3e48d Binary files /dev/null and b/public/images/pokemon/variant/icons/2/216_2.png differ diff --git a/public/images/pokemon/variant/icons/2/216_3.png b/public/images/pokemon/variant/icons/2/216_3.png new file mode 100644 index 00000000000..1e665cb2ac9 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/216_3.png differ diff --git a/public/images/pokemon/variant/icons/2/217_1.png b/public/images/pokemon/variant/icons/2/217_1.png new file mode 100644 index 00000000000..e78f591eb1e Binary files /dev/null and b/public/images/pokemon/variant/icons/2/217_1.png differ diff --git a/public/images/pokemon/variant/icons/2/217_2.png b/public/images/pokemon/variant/icons/2/217_2.png new file mode 100644 index 00000000000..df6320e8e27 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/217_2.png differ diff --git a/public/images/pokemon/variant/icons/2/217_3.png b/public/images/pokemon/variant/icons/2/217_3.png new file mode 100644 index 00000000000..d71bfd65040 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/217_3.png differ diff --git a/public/images/pokemon/variant/icons/2/226_2.png b/public/images/pokemon/variant/icons/2/226_2.png new file mode 100644 index 00000000000..8eea84d7002 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/226_2.png differ diff --git a/public/images/pokemon/variant/icons/2/226_3.png b/public/images/pokemon/variant/icons/2/226_3.png new file mode 100644 index 00000000000..655ce9e32a7 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/226_3.png differ diff --git a/public/images/pokemon/variant/icons/2/239_1.png b/public/images/pokemon/variant/icons/2/239_1.png new file mode 100644 index 00000000000..e4fe2ae4e14 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/239_1.png differ diff --git a/public/images/pokemon/variant/icons/2/239_2.png b/public/images/pokemon/variant/icons/2/239_2.png new file mode 100644 index 00000000000..7a3c759ff62 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/239_2.png differ diff --git a/public/images/pokemon/variant/icons/2/239_3.png b/public/images/pokemon/variant/icons/2/239_3.png new file mode 100644 index 00000000000..f2d33133fab Binary files /dev/null and b/public/images/pokemon/variant/icons/2/239_3.png differ diff --git a/public/images/pokemon/variant/icons/2/242_1.png b/public/images/pokemon/variant/icons/2/242_1.png new file mode 100644 index 00000000000..cb486161264 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/242_1.png differ diff --git a/public/images/pokemon/variant/icons/2/242_2.png b/public/images/pokemon/variant/icons/2/242_2.png new file mode 100644 index 00000000000..478db55af73 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/242_2.png differ diff --git a/public/images/pokemon/variant/icons/2/242_3.png b/public/images/pokemon/variant/icons/2/242_3.png new file mode 100644 index 00000000000..6a22a1ebbf1 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/242_3.png differ diff --git a/public/images/pokemon/variant/icons/2/243_2.png b/public/images/pokemon/variant/icons/2/243_2.png new file mode 100644 index 00000000000..586b706f4e8 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/243_2.png differ diff --git a/public/images/pokemon/variant/icons/2/243_3.png b/public/images/pokemon/variant/icons/2/243_3.png new file mode 100644 index 00000000000..58aa6b3470c Binary files /dev/null and b/public/images/pokemon/variant/icons/2/243_3.png differ diff --git a/public/images/pokemon/variant/icons/2/244_2.png b/public/images/pokemon/variant/icons/2/244_2.png new file mode 100644 index 00000000000..753fce18f2e Binary files /dev/null and b/public/images/pokemon/variant/icons/2/244_2.png differ diff --git a/public/images/pokemon/variant/icons/2/244_3.png b/public/images/pokemon/variant/icons/2/244_3.png new file mode 100644 index 00000000000..3ce134570d5 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/244_3.png differ diff --git a/public/images/pokemon/variant/icons/2/245_2.png b/public/images/pokemon/variant/icons/2/245_2.png new file mode 100644 index 00000000000..54a5eccc7bb Binary files /dev/null and b/public/images/pokemon/variant/icons/2/245_2.png differ diff --git a/public/images/pokemon/variant/icons/2/245_3.png b/public/images/pokemon/variant/icons/2/245_3.png new file mode 100644 index 00000000000..91a195809d7 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/245_3.png differ diff --git a/public/images/pokemon/variant/icons/2/249_2.png b/public/images/pokemon/variant/icons/2/249_2.png new file mode 100644 index 00000000000..87b8525c716 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/249_2.png differ diff --git a/public/images/pokemon/variant/icons/2/249_3.png b/public/images/pokemon/variant/icons/2/249_3.png new file mode 100644 index 00000000000..b8142d29758 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/249_3.png differ diff --git a/public/images/pokemon/variant/icons/2/250_2.png b/public/images/pokemon/variant/icons/2/250_2.png new file mode 100644 index 00000000000..cbdd7d6c17f Binary files /dev/null and b/public/images/pokemon/variant/icons/2/250_2.png differ diff --git a/public/images/pokemon/variant/icons/2/250_3.png b/public/images/pokemon/variant/icons/2/250_3.png new file mode 100644 index 00000000000..160bc12a516 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/250_3.png differ diff --git a/public/images/pokemon/variant/icons/2/251_2.png b/public/images/pokemon/variant/icons/2/251_2.png new file mode 100644 index 00000000000..05ba4721a89 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/251_2.png differ diff --git a/public/images/pokemon/variant/icons/2/251_3.png b/public/images/pokemon/variant/icons/2/251_3.png new file mode 100644 index 00000000000..05084ac8687 Binary files /dev/null and b/public/images/pokemon/variant/icons/2/251_3.png differ diff --git a/public/images/pokemon/variant/icons/3/263_2.png b/public/images/pokemon/variant/icons/3/263_2.png new file mode 100644 index 00000000000..b638deec648 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/263_2.png differ diff --git a/public/images/pokemon/variant/icons/3/263_3.png b/public/images/pokemon/variant/icons/3/263_3.png new file mode 100644 index 00000000000..5c5f447c79a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/263_3.png differ diff --git a/public/images/pokemon/variant/icons/3/264_2.png b/public/images/pokemon/variant/icons/3/264_2.png new file mode 100644 index 00000000000..42f87b76058 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/264_2.png differ diff --git a/public/images/pokemon/variant/icons/3/264_3.png b/public/images/pokemon/variant/icons/3/264_3.png new file mode 100644 index 00000000000..88d700d9a9e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/264_3.png differ diff --git a/public/images/pokemon/variant/icons/3/280_2.png b/public/images/pokemon/variant/icons/3/280_2.png new file mode 100644 index 00000000000..41b3f16cf7b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/280_2.png differ diff --git a/public/images/pokemon/variant/icons/3/280_3.png b/public/images/pokemon/variant/icons/3/280_3.png new file mode 100644 index 00000000000..ccda545679a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/280_3.png differ diff --git a/public/images/pokemon/variant/icons/3/281_2.png b/public/images/pokemon/variant/icons/3/281_2.png new file mode 100644 index 00000000000..0fdc825165d Binary files /dev/null and b/public/images/pokemon/variant/icons/3/281_2.png differ diff --git a/public/images/pokemon/variant/icons/3/281_3.png b/public/images/pokemon/variant/icons/3/281_3.png new file mode 100644 index 00000000000..c391b0a70c9 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/281_3.png differ diff --git a/public/images/pokemon/variant/icons/3/282-mega_2.png b/public/images/pokemon/variant/icons/3/282-mega_2.png new file mode 100644 index 00000000000..c13887e02a9 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/282-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/282-mega_3.png b/public/images/pokemon/variant/icons/3/282-mega_3.png new file mode 100644 index 00000000000..ac55c249e16 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/282-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/282_2.png b/public/images/pokemon/variant/icons/3/282_2.png new file mode 100644 index 00000000000..cdfea76c6f3 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/282_2.png differ diff --git a/public/images/pokemon/variant/icons/3/282_3.png b/public/images/pokemon/variant/icons/3/282_3.png new file mode 100644 index 00000000000..932b8834224 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/282_3.png differ diff --git a/public/images/pokemon/variant/icons/3/285_2.png b/public/images/pokemon/variant/icons/3/285_2.png new file mode 100644 index 00000000000..b05cc520bbe Binary files /dev/null and b/public/images/pokemon/variant/icons/3/285_2.png differ diff --git a/public/images/pokemon/variant/icons/3/285_3.png b/public/images/pokemon/variant/icons/3/285_3.png new file mode 100644 index 00000000000..890a902003f Binary files /dev/null and b/public/images/pokemon/variant/icons/3/285_3.png differ diff --git a/public/images/pokemon/variant/icons/3/286_2.png b/public/images/pokemon/variant/icons/3/286_2.png new file mode 100644 index 00000000000..a0b4f9ba99d Binary files /dev/null and b/public/images/pokemon/variant/icons/3/286_2.png differ diff --git a/public/images/pokemon/variant/icons/3/286_3.png b/public/images/pokemon/variant/icons/3/286_3.png new file mode 100644 index 00000000000..96d11a91d18 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/286_3.png differ diff --git a/public/images/pokemon/variant/icons/3/290_1.png b/public/images/pokemon/variant/icons/3/290_1.png new file mode 100644 index 00000000000..579e4b838ed Binary files /dev/null and b/public/images/pokemon/variant/icons/3/290_1.png differ diff --git a/public/images/pokemon/variant/icons/3/290_2.png b/public/images/pokemon/variant/icons/3/290_2.png new file mode 100644 index 00000000000..659f57722eb Binary files /dev/null and b/public/images/pokemon/variant/icons/3/290_2.png differ diff --git a/public/images/pokemon/variant/icons/3/290_3.png b/public/images/pokemon/variant/icons/3/290_3.png new file mode 100644 index 00000000000..962386bea49 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/290_3.png differ diff --git a/public/images/pokemon/variant/icons/3/291_1.png b/public/images/pokemon/variant/icons/3/291_1.png new file mode 100644 index 00000000000..ab56b0f6763 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/291_1.png differ diff --git a/public/images/pokemon/variant/icons/3/291_2.png b/public/images/pokemon/variant/icons/3/291_2.png new file mode 100644 index 00000000000..55706b1ad44 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/291_2.png differ diff --git a/public/images/pokemon/variant/icons/3/291_3.png b/public/images/pokemon/variant/icons/3/291_3.png new file mode 100644 index 00000000000..4e4a5aa421b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/291_3.png differ diff --git a/public/images/pokemon/variant/icons/3/292_1.png b/public/images/pokemon/variant/icons/3/292_1.png new file mode 100644 index 00000000000..b03645b1550 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/292_1.png differ diff --git a/public/images/pokemon/variant/icons/3/292_2.png b/public/images/pokemon/variant/icons/3/292_2.png new file mode 100644 index 00000000000..2b3a097c067 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/292_2.png differ diff --git a/public/images/pokemon/variant/icons/3/292_3.png b/public/images/pokemon/variant/icons/3/292_3.png new file mode 100644 index 00000000000..d8cd945026a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/292_3.png differ diff --git a/public/images/pokemon/variant/icons/3/298_2.png b/public/images/pokemon/variant/icons/3/298_2.png new file mode 100644 index 00000000000..2c959be835a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/298_2.png differ diff --git a/public/images/pokemon/variant/icons/3/298_3.png b/public/images/pokemon/variant/icons/3/298_3.png new file mode 100644 index 00000000000..559bc8434cd Binary files /dev/null and b/public/images/pokemon/variant/icons/3/298_3.png differ diff --git a/public/images/pokemon/variant/icons/3/300_1.png b/public/images/pokemon/variant/icons/3/300_1.png new file mode 100644 index 00000000000..3e3665320b0 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/300_1.png differ diff --git a/public/images/pokemon/variant/icons/3/300_2.png b/public/images/pokemon/variant/icons/3/300_2.png new file mode 100644 index 00000000000..a436bc177c3 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/300_2.png differ diff --git a/public/images/pokemon/variant/icons/3/300_3.png b/public/images/pokemon/variant/icons/3/300_3.png new file mode 100644 index 00000000000..ec4565df0d5 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/300_3.png differ diff --git a/public/images/pokemon/variant/icons/3/301_1.png b/public/images/pokemon/variant/icons/3/301_1.png new file mode 100644 index 00000000000..a32df44a3cd Binary files /dev/null and b/public/images/pokemon/variant/icons/3/301_1.png differ diff --git a/public/images/pokemon/variant/icons/3/301_2.png b/public/images/pokemon/variant/icons/3/301_2.png new file mode 100644 index 00000000000..38aa20f736e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/301_2.png differ diff --git a/public/images/pokemon/variant/icons/3/301_3.png b/public/images/pokemon/variant/icons/3/301_3.png new file mode 100644 index 00000000000..6ca7830a437 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/301_3.png differ diff --git a/public/images/pokemon/variant/icons/3/303-mega_1.png b/public/images/pokemon/variant/icons/3/303-mega_1.png new file mode 100644 index 00000000000..0290f7c2662 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/303-mega_1.png differ diff --git a/public/images/pokemon/variant/icons/3/303-mega_2.png b/public/images/pokemon/variant/icons/3/303-mega_2.png new file mode 100644 index 00000000000..f0132c2e149 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/303-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/303-mega_3.png b/public/images/pokemon/variant/icons/3/303-mega_3.png new file mode 100644 index 00000000000..4e81c96c1b8 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/303-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/303_2.png b/public/images/pokemon/variant/icons/3/303_2.png new file mode 100644 index 00000000000..394d3676be4 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/303_2.png differ diff --git a/public/images/pokemon/variant/icons/3/303_3.png b/public/images/pokemon/variant/icons/3/303_3.png new file mode 100644 index 00000000000..7f862199926 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/303_3.png differ diff --git a/public/images/pokemon/variant/icons/3/304_1.png b/public/images/pokemon/variant/icons/3/304_1.png new file mode 100644 index 00000000000..a32ec0a4a33 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/304_1.png differ diff --git a/public/images/pokemon/variant/icons/3/304_2.png b/public/images/pokemon/variant/icons/3/304_2.png new file mode 100644 index 00000000000..c670ee0ee21 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/304_2.png differ diff --git a/public/images/pokemon/variant/icons/3/304_3.png b/public/images/pokemon/variant/icons/3/304_3.png new file mode 100644 index 00000000000..e83399a5ff7 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/304_3.png differ diff --git a/public/images/pokemon/variant/icons/3/305_1.png b/public/images/pokemon/variant/icons/3/305_1.png new file mode 100644 index 00000000000..c98222a0bdd Binary files /dev/null and b/public/images/pokemon/variant/icons/3/305_1.png differ diff --git a/public/images/pokemon/variant/icons/3/305_2.png b/public/images/pokemon/variant/icons/3/305_2.png new file mode 100644 index 00000000000..d1db8f49dcc Binary files /dev/null and b/public/images/pokemon/variant/icons/3/305_2.png differ diff --git a/public/images/pokemon/variant/icons/3/305_3.png b/public/images/pokemon/variant/icons/3/305_3.png new file mode 100644 index 00000000000..404d304f493 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/305_3.png differ diff --git a/public/images/pokemon/variant/icons/3/306-mega_1.png b/public/images/pokemon/variant/icons/3/306-mega_1.png new file mode 100644 index 00000000000..c2a5bde0654 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/306-mega_1.png differ diff --git a/public/images/pokemon/variant/icons/3/306-mega_2.png b/public/images/pokemon/variant/icons/3/306-mega_2.png new file mode 100644 index 00000000000..87eb1a366b7 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/306-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/306-mega_3.png b/public/images/pokemon/variant/icons/3/306-mega_3.png new file mode 100644 index 00000000000..5a87dae0a45 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/306-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/306_1.png b/public/images/pokemon/variant/icons/3/306_1.png new file mode 100644 index 00000000000..dc4cdd8fb54 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/306_1.png differ diff --git a/public/images/pokemon/variant/icons/3/306_2.png b/public/images/pokemon/variant/icons/3/306_2.png new file mode 100644 index 00000000000..4d5ed76f0c5 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/306_2.png differ diff --git a/public/images/pokemon/variant/icons/3/306_3.png b/public/images/pokemon/variant/icons/3/306_3.png new file mode 100644 index 00000000000..de5e70eb4e6 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/306_3.png differ diff --git a/public/images/pokemon/variant/icons/3/307_2.png b/public/images/pokemon/variant/icons/3/307_2.png new file mode 100644 index 00000000000..13af3fbcf5e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/307_2.png differ diff --git a/public/images/pokemon/variant/icons/3/307_3.png b/public/images/pokemon/variant/icons/3/307_3.png new file mode 100644 index 00000000000..1ad23e2038d Binary files /dev/null and b/public/images/pokemon/variant/icons/3/307_3.png differ diff --git a/public/images/pokemon/variant/icons/3/308-mega_2.png b/public/images/pokemon/variant/icons/3/308-mega_2.png new file mode 100644 index 00000000000..8a5213092f9 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/308-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/308-mega_3.png b/public/images/pokemon/variant/icons/3/308-mega_3.png new file mode 100644 index 00000000000..7e3d7ddc258 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/308-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/308_2.png b/public/images/pokemon/variant/icons/3/308_2.png new file mode 100644 index 00000000000..d72c502ea22 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/308_2.png differ diff --git a/public/images/pokemon/variant/icons/3/308_3.png b/public/images/pokemon/variant/icons/3/308_3.png new file mode 100644 index 00000000000..135e7bc80a0 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/308_3.png differ diff --git a/public/images/pokemon/variant/icons/3/309_2.png b/public/images/pokemon/variant/icons/3/309_2.png new file mode 100644 index 00000000000..96321bed7b4 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/309_2.png differ diff --git a/public/images/pokemon/variant/icons/3/309_3.png b/public/images/pokemon/variant/icons/3/309_3.png new file mode 100644 index 00000000000..a186f8caf08 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/309_3.png differ diff --git a/public/images/pokemon/variant/icons/3/310-mega_2.png b/public/images/pokemon/variant/icons/3/310-mega_2.png new file mode 100644 index 00000000000..0d5e9c9d949 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/310-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/310-mega_3.png b/public/images/pokemon/variant/icons/3/310-mega_3.png new file mode 100644 index 00000000000..0bf7151a167 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/310-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/310_2.png b/public/images/pokemon/variant/icons/3/310_2.png new file mode 100644 index 00000000000..9740c5d90bd Binary files /dev/null and b/public/images/pokemon/variant/icons/3/310_2.png differ diff --git a/public/images/pokemon/variant/icons/3/310_3.png b/public/images/pokemon/variant/icons/3/310_3.png new file mode 100644 index 00000000000..d6c98bd3345 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/310_3.png differ diff --git a/public/images/pokemon/variant/icons/3/311_1.png b/public/images/pokemon/variant/icons/3/311_1.png new file mode 100644 index 00000000000..cc452edb63e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/311_1.png differ diff --git a/public/images/pokemon/variant/icons/3/311_2.png b/public/images/pokemon/variant/icons/3/311_2.png new file mode 100644 index 00000000000..576dc178357 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/311_2.png differ diff --git a/public/images/pokemon/variant/icons/3/311_3.png b/public/images/pokemon/variant/icons/3/311_3.png new file mode 100644 index 00000000000..211f761c5f9 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/311_3.png differ diff --git a/public/images/pokemon/variant/icons/3/312_2.png b/public/images/pokemon/variant/icons/3/312_2.png new file mode 100644 index 00000000000..140653e6303 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/312_2.png differ diff --git a/public/images/pokemon/variant/icons/3/312_3.png b/public/images/pokemon/variant/icons/3/312_3.png new file mode 100644 index 00000000000..edf091157b5 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/312_3.png differ diff --git a/public/images/pokemon/variant/icons/3/328_2.png b/public/images/pokemon/variant/icons/3/328_2.png new file mode 100644 index 00000000000..8fa26e80d4b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/328_2.png differ diff --git a/public/images/pokemon/variant/icons/3/328_3.png b/public/images/pokemon/variant/icons/3/328_3.png new file mode 100644 index 00000000000..10b2d3cf6e2 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/328_3.png differ diff --git a/public/images/pokemon/variant/icons/3/329_2.png b/public/images/pokemon/variant/icons/3/329_2.png new file mode 100644 index 00000000000..ec4da909118 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/329_2.png differ diff --git a/public/images/pokemon/variant/icons/3/329_3.png b/public/images/pokemon/variant/icons/3/329_3.png new file mode 100644 index 00000000000..c58ca1f9b4b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/329_3.png differ diff --git a/public/images/pokemon/variant/icons/3/330_2.png b/public/images/pokemon/variant/icons/3/330_2.png new file mode 100644 index 00000000000..db09dd178c0 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/330_2.png differ diff --git a/public/images/pokemon/variant/icons/3/330_3.png b/public/images/pokemon/variant/icons/3/330_3.png new file mode 100644 index 00000000000..457139323d8 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/330_3.png differ diff --git a/public/images/pokemon/variant/icons/3/333_2.png b/public/images/pokemon/variant/icons/3/333_2.png new file mode 100644 index 00000000000..dba83c56e4c Binary files /dev/null and b/public/images/pokemon/variant/icons/3/333_2.png differ diff --git a/public/images/pokemon/variant/icons/3/333_3.png b/public/images/pokemon/variant/icons/3/333_3.png new file mode 100644 index 00000000000..052e9cdbb6e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/333_3.png differ diff --git a/public/images/pokemon/variant/icons/3/334-mega_2.png b/public/images/pokemon/variant/icons/3/334-mega_2.png new file mode 100644 index 00000000000..dbd6e0d6d2e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/334-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/334-mega_3.png b/public/images/pokemon/variant/icons/3/334-mega_3.png new file mode 100644 index 00000000000..6386fd580a5 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/334-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/334_2.png b/public/images/pokemon/variant/icons/3/334_2.png new file mode 100644 index 00000000000..ed4a145fa40 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/334_2.png differ diff --git a/public/images/pokemon/variant/icons/3/334_3.png b/public/images/pokemon/variant/icons/3/334_3.png new file mode 100644 index 00000000000..08d3ac09a40 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/334_3.png differ diff --git a/public/images/pokemon/variant/icons/3/335_2.png b/public/images/pokemon/variant/icons/3/335_2.png new file mode 100644 index 00000000000..d80d7eed180 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/335_2.png differ diff --git a/public/images/pokemon/variant/icons/3/335_3.png b/public/images/pokemon/variant/icons/3/335_3.png new file mode 100644 index 00000000000..99dd3396f6b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/335_3.png differ diff --git a/public/images/pokemon/variant/icons/3/336_2.png b/public/images/pokemon/variant/icons/3/336_2.png new file mode 100644 index 00000000000..385bb807f1a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/336_2.png differ diff --git a/public/images/pokemon/variant/icons/3/336_3.png b/public/images/pokemon/variant/icons/3/336_3.png new file mode 100644 index 00000000000..b2d2add9558 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/336_3.png differ diff --git a/public/images/pokemon/variant/icons/3/338_2.png b/public/images/pokemon/variant/icons/3/338_2.png new file mode 100644 index 00000000000..16abeba277a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/338_2.png differ diff --git a/public/images/pokemon/variant/icons/3/338_3.png b/public/images/pokemon/variant/icons/3/338_3.png new file mode 100644 index 00000000000..f11206858a5 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/338_3.png differ diff --git a/public/images/pokemon/variant/icons/3/339_2.png b/public/images/pokemon/variant/icons/3/339_2.png new file mode 100644 index 00000000000..d4a6b9c0c63 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/339_2.png differ diff --git a/public/images/pokemon/variant/icons/3/339_3.png b/public/images/pokemon/variant/icons/3/339_3.png new file mode 100644 index 00000000000..2f5399ce5fb Binary files /dev/null and b/public/images/pokemon/variant/icons/3/339_3.png differ diff --git a/public/images/pokemon/variant/icons/3/340_2.png b/public/images/pokemon/variant/icons/3/340_2.png new file mode 100644 index 00000000000..a53af7dd28f Binary files /dev/null and b/public/images/pokemon/variant/icons/3/340_2.png differ diff --git a/public/images/pokemon/variant/icons/3/340_3.png b/public/images/pokemon/variant/icons/3/340_3.png new file mode 100644 index 00000000000..55844131ca8 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/340_3.png differ diff --git a/public/images/pokemon/variant/icons/3/351-rainy_1.png b/public/images/pokemon/variant/icons/3/351-rainy_1.png new file mode 100644 index 00000000000..7038b441db7 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-rainy_1.png differ diff --git a/public/images/pokemon/variant/icons/3/351-rainy_2.png b/public/images/pokemon/variant/icons/3/351-rainy_2.png new file mode 100644 index 00000000000..87617e2761e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-rainy_2.png differ diff --git a/public/images/pokemon/variant/icons/3/351-rainy_3.png b/public/images/pokemon/variant/icons/3/351-rainy_3.png new file mode 100644 index 00000000000..9be0fd449ae Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-rainy_3.png differ diff --git a/public/images/pokemon/variant/icons/3/351-snowy_1.png b/public/images/pokemon/variant/icons/3/351-snowy_1.png new file mode 100644 index 00000000000..12527d321ce Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-snowy_1.png differ diff --git a/public/images/pokemon/variant/icons/3/351-snowy_2.png b/public/images/pokemon/variant/icons/3/351-snowy_2.png new file mode 100644 index 00000000000..22ee53ee9e9 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-snowy_2.png differ diff --git a/public/images/pokemon/variant/icons/3/351-snowy_3.png b/public/images/pokemon/variant/icons/3/351-snowy_3.png new file mode 100644 index 00000000000..af0437e2599 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-snowy_3.png differ diff --git a/public/images/pokemon/variant/icons/3/351-sunny_1.png b/public/images/pokemon/variant/icons/3/351-sunny_1.png new file mode 100644 index 00000000000..2b24ac4d0b1 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-sunny_1.png differ diff --git a/public/images/pokemon/variant/icons/3/351-sunny_2.png b/public/images/pokemon/variant/icons/3/351-sunny_2.png new file mode 100644 index 00000000000..cb1584e4c69 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-sunny_2.png differ diff --git a/public/images/pokemon/variant/icons/3/351-sunny_3.png b/public/images/pokemon/variant/icons/3/351-sunny_3.png new file mode 100644 index 00000000000..6c92a04864b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351-sunny_3.png differ diff --git a/public/images/pokemon/variant/icons/3/351_2.png b/public/images/pokemon/variant/icons/3/351_2.png new file mode 100644 index 00000000000..f318301a31b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351_2.png differ diff --git a/public/images/pokemon/variant/icons/3/351_3.png b/public/images/pokemon/variant/icons/3/351_3.png new file mode 100644 index 00000000000..9035c6243ad Binary files /dev/null and b/public/images/pokemon/variant/icons/3/351_3.png differ diff --git a/public/images/pokemon/variant/icons/3/352_1.png b/public/images/pokemon/variant/icons/3/352_1.png new file mode 100644 index 00000000000..f6e0f96024a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/352_1.png differ diff --git a/public/images/pokemon/variant/icons/3/352_2.png b/public/images/pokemon/variant/icons/3/352_2.png new file mode 100644 index 00000000000..88d67f91e1a Binary files /dev/null and b/public/images/pokemon/variant/icons/3/352_2.png differ diff --git a/public/images/pokemon/variant/icons/3/352_3.png b/public/images/pokemon/variant/icons/3/352_3.png new file mode 100644 index 00000000000..e4f659efac0 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/352_3.png differ diff --git a/public/images/pokemon/variant/icons/3/358_1.png b/public/images/pokemon/variant/icons/3/358_1.png new file mode 100644 index 00000000000..14deda92d58 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/358_1.png differ diff --git a/public/images/pokemon/variant/icons/3/358_2.png b/public/images/pokemon/variant/icons/3/358_2.png new file mode 100644 index 00000000000..181fe4226c1 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/358_2.png differ diff --git a/public/images/pokemon/variant/icons/3/358_3.png b/public/images/pokemon/variant/icons/3/358_3.png new file mode 100644 index 00000000000..a5b66165185 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/358_3.png differ diff --git a/public/images/pokemon/variant/icons/3/371_2.png b/public/images/pokemon/variant/icons/3/371_2.png new file mode 100644 index 00000000000..ab0c5d20606 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/371_2.png differ diff --git a/public/images/pokemon/variant/icons/3/371_3.png b/public/images/pokemon/variant/icons/3/371_3.png new file mode 100644 index 00000000000..b0f27c88ed3 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/371_3.png differ diff --git a/public/images/pokemon/variant/icons/3/372_2.png b/public/images/pokemon/variant/icons/3/372_2.png new file mode 100644 index 00000000000..9ee2adbfa07 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/372_2.png differ diff --git a/public/images/pokemon/variant/icons/3/372_3.png b/public/images/pokemon/variant/icons/3/372_3.png new file mode 100644 index 00000000000..00ad94a4fe7 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/372_3.png differ diff --git a/public/images/pokemon/variant/icons/3/373-mega_2.png b/public/images/pokemon/variant/icons/3/373-mega_2.png new file mode 100644 index 00000000000..1ec3b8409e5 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/373-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/373-mega_3.png b/public/images/pokemon/variant/icons/3/373-mega_3.png new file mode 100644 index 00000000000..9f0952fd6ef Binary files /dev/null and b/public/images/pokemon/variant/icons/3/373-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/373_2.png b/public/images/pokemon/variant/icons/3/373_2.png new file mode 100644 index 00000000000..38401abab0e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/373_2.png differ diff --git a/public/images/pokemon/variant/icons/3/373_3.png b/public/images/pokemon/variant/icons/3/373_3.png new file mode 100644 index 00000000000..8e2d3eabf26 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/373_3.png differ diff --git a/public/images/pokemon/variant/icons/3/374_2.png b/public/images/pokemon/variant/icons/3/374_2.png new file mode 100644 index 00000000000..356f1d29177 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/374_2.png differ diff --git a/public/images/pokemon/variant/icons/3/374_3.png b/public/images/pokemon/variant/icons/3/374_3.png new file mode 100644 index 00000000000..19eb72b7eba Binary files /dev/null and b/public/images/pokemon/variant/icons/3/374_3.png differ diff --git a/public/images/pokemon/variant/icons/3/375_2.png b/public/images/pokemon/variant/icons/3/375_2.png new file mode 100644 index 00000000000..de4efa75503 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/375_2.png differ diff --git a/public/images/pokemon/variant/icons/3/375_3.png b/public/images/pokemon/variant/icons/3/375_3.png new file mode 100644 index 00000000000..2b6b637f48e Binary files /dev/null and b/public/images/pokemon/variant/icons/3/375_3.png differ diff --git a/public/images/pokemon/variant/icons/3/376-mega_2.png b/public/images/pokemon/variant/icons/3/376-mega_2.png new file mode 100644 index 00000000000..86557ca063f Binary files /dev/null and b/public/images/pokemon/variant/icons/3/376-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/376-mega_3.png b/public/images/pokemon/variant/icons/3/376-mega_3.png new file mode 100644 index 00000000000..01b165922bd Binary files /dev/null and b/public/images/pokemon/variant/icons/3/376-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/376_2.png b/public/images/pokemon/variant/icons/3/376_2.png new file mode 100644 index 00000000000..f07844d885b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/376_2.png differ diff --git a/public/images/pokemon/variant/icons/3/376_3.png b/public/images/pokemon/variant/icons/3/376_3.png new file mode 100644 index 00000000000..19b62f2eee7 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/376_3.png differ diff --git a/public/images/pokemon/variant/icons/3/380-mega_2.png b/public/images/pokemon/variant/icons/3/380-mega_2.png new file mode 100644 index 00000000000..fcec45a699d Binary files /dev/null and b/public/images/pokemon/variant/icons/3/380-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/380-mega_3.png b/public/images/pokemon/variant/icons/3/380-mega_3.png new file mode 100644 index 00000000000..6d0f0be1a47 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/380-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/380_2.png b/public/images/pokemon/variant/icons/3/380_2.png new file mode 100644 index 00000000000..397465205dd Binary files /dev/null and b/public/images/pokemon/variant/icons/3/380_2.png differ diff --git a/public/images/pokemon/variant/icons/3/380_3.png b/public/images/pokemon/variant/icons/3/380_3.png new file mode 100644 index 00000000000..85b4b46b4f0 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/380_3.png differ diff --git a/public/images/pokemon/variant/icons/3/381-mega_2.png b/public/images/pokemon/variant/icons/3/381-mega_2.png new file mode 100644 index 00000000000..b1a8b998122 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/381-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/381-mega_3.png b/public/images/pokemon/variant/icons/3/381-mega_3.png new file mode 100644 index 00000000000..9dfbc4851fe Binary files /dev/null and b/public/images/pokemon/variant/icons/3/381-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/381_2.png b/public/images/pokemon/variant/icons/3/381_2.png new file mode 100644 index 00000000000..43038b9374f Binary files /dev/null and b/public/images/pokemon/variant/icons/3/381_2.png differ diff --git a/public/images/pokemon/variant/icons/3/381_3.png b/public/images/pokemon/variant/icons/3/381_3.png new file mode 100644 index 00000000000..4bf798dcedc Binary files /dev/null and b/public/images/pokemon/variant/icons/3/381_3.png differ diff --git a/public/images/pokemon/variant/icons/3/382-primal_2.png b/public/images/pokemon/variant/icons/3/382-primal_2.png new file mode 100644 index 00000000000..c39b5333c00 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/382-primal_2.png differ diff --git a/public/images/pokemon/variant/icons/3/382-primal_3.png b/public/images/pokemon/variant/icons/3/382-primal_3.png new file mode 100644 index 00000000000..4a2eba5f6c9 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/382-primal_3.png differ diff --git a/public/images/pokemon/variant/icons/3/382_2.png b/public/images/pokemon/variant/icons/3/382_2.png new file mode 100644 index 00000000000..ce4f0476e86 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/382_2.png differ diff --git a/public/images/pokemon/variant/icons/3/382_3.png b/public/images/pokemon/variant/icons/3/382_3.png new file mode 100644 index 00000000000..6765d49f856 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/382_3.png differ diff --git a/public/images/pokemon/variant/icons/3/383-primal_2.png b/public/images/pokemon/variant/icons/3/383-primal_2.png new file mode 100644 index 00000000000..32abb4b9132 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/383-primal_2.png differ diff --git a/public/images/pokemon/variant/icons/3/383-primal_3.png b/public/images/pokemon/variant/icons/3/383-primal_3.png new file mode 100644 index 00000000000..952e08e33d2 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/383-primal_3.png differ diff --git a/public/images/pokemon/variant/icons/3/383_2.png b/public/images/pokemon/variant/icons/3/383_2.png new file mode 100644 index 00000000000..3f5353822a1 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/383_2.png differ diff --git a/public/images/pokemon/variant/icons/3/383_3.png b/public/images/pokemon/variant/icons/3/383_3.png new file mode 100644 index 00000000000..2549558a301 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/383_3.png differ diff --git a/public/images/pokemon/variant/icons/3/384-mega_2.png b/public/images/pokemon/variant/icons/3/384-mega_2.png new file mode 100644 index 00000000000..4715d127ff6 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/384-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/3/384-mega_3.png b/public/images/pokemon/variant/icons/3/384-mega_3.png new file mode 100644 index 00000000000..ee344250831 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/384-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/3/384_2.png b/public/images/pokemon/variant/icons/3/384_2.png new file mode 100644 index 00000000000..2835499beca Binary files /dev/null and b/public/images/pokemon/variant/icons/3/384_2.png differ diff --git a/public/images/pokemon/variant/icons/3/384_3.png b/public/images/pokemon/variant/icons/3/384_3.png new file mode 100644 index 00000000000..84ff706b9fa Binary files /dev/null and b/public/images/pokemon/variant/icons/3/384_3.png differ diff --git a/public/images/pokemon/variant/icons/3/385_1.png b/public/images/pokemon/variant/icons/3/385_1.png new file mode 100644 index 00000000000..5b66629d94b Binary files /dev/null and b/public/images/pokemon/variant/icons/3/385_1.png differ diff --git a/public/images/pokemon/variant/icons/3/385_2.png b/public/images/pokemon/variant/icons/3/385_2.png new file mode 100644 index 00000000000..f9efafe0634 Binary files /dev/null and b/public/images/pokemon/variant/icons/3/385_2.png differ diff --git a/public/images/pokemon/variant/icons/3/385_3.png b/public/images/pokemon/variant/icons/3/385_3.png new file mode 100644 index 00000000000..6b2bdaa1fac Binary files /dev/null and b/public/images/pokemon/variant/icons/3/385_3.png differ diff --git a/public/images/pokemon/variant/icons/4/399_2.png b/public/images/pokemon/variant/icons/4/399_2.png new file mode 100644 index 00000000000..bdf0093d408 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/399_2.png differ diff --git a/public/images/pokemon/variant/icons/4/399_3.png b/public/images/pokemon/variant/icons/4/399_3.png new file mode 100644 index 00000000000..5459fc5a8a1 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/399_3.png differ diff --git a/public/images/pokemon/variant/icons/4/400_2.png b/public/images/pokemon/variant/icons/4/400_2.png new file mode 100644 index 00000000000..b7a5ad3e272 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/400_2.png differ diff --git a/public/images/pokemon/variant/icons/4/400_3.png b/public/images/pokemon/variant/icons/4/400_3.png new file mode 100644 index 00000000000..2d4c4c03c3d Binary files /dev/null and b/public/images/pokemon/variant/icons/4/400_3.png differ diff --git a/public/images/pokemon/variant/icons/4/425_2.png b/public/images/pokemon/variant/icons/4/425_2.png new file mode 100644 index 00000000000..5387e9cce3c Binary files /dev/null and b/public/images/pokemon/variant/icons/4/425_2.png differ diff --git a/public/images/pokemon/variant/icons/4/425_3.png b/public/images/pokemon/variant/icons/4/425_3.png new file mode 100644 index 00000000000..efe3d656964 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/425_3.png differ diff --git a/public/images/pokemon/variant/icons/4/426_2.png b/public/images/pokemon/variant/icons/4/426_2.png new file mode 100644 index 00000000000..5f1805f8acb Binary files /dev/null and b/public/images/pokemon/variant/icons/4/426_2.png differ diff --git a/public/images/pokemon/variant/icons/4/426_3.png b/public/images/pokemon/variant/icons/4/426_3.png new file mode 100644 index 00000000000..2a7b3be7ab9 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/426_3.png differ diff --git a/public/images/pokemon/variant/icons/4/427_2.png b/public/images/pokemon/variant/icons/4/427_2.png new file mode 100644 index 00000000000..1b5d9271624 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/427_2.png differ diff --git a/public/images/pokemon/variant/icons/4/427_3.png b/public/images/pokemon/variant/icons/4/427_3.png new file mode 100644 index 00000000000..a3f90ea6dfa Binary files /dev/null and b/public/images/pokemon/variant/icons/4/427_3.png differ diff --git a/public/images/pokemon/variant/icons/4/428-mega_2.png b/public/images/pokemon/variant/icons/4/428-mega_2.png new file mode 100644 index 00000000000..43dfa05d438 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/428-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/4/428-mega_3.png b/public/images/pokemon/variant/icons/4/428-mega_3.png new file mode 100644 index 00000000000..4d6194bd554 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/428-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/4/428_2.png b/public/images/pokemon/variant/icons/4/428_2.png new file mode 100644 index 00000000000..1e42720c78b Binary files /dev/null and b/public/images/pokemon/variant/icons/4/428_2.png differ diff --git a/public/images/pokemon/variant/icons/4/428_3.png b/public/images/pokemon/variant/icons/4/428_3.png new file mode 100644 index 00000000000..b8bf01bb20d Binary files /dev/null and b/public/images/pokemon/variant/icons/4/428_3.png differ diff --git a/public/images/pokemon/variant/icons/4/429_1.png b/public/images/pokemon/variant/icons/4/429_1.png new file mode 100644 index 00000000000..7354a6a6be7 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/429_1.png differ diff --git a/public/images/pokemon/variant/icons/4/429_2.png b/public/images/pokemon/variant/icons/4/429_2.png new file mode 100644 index 00000000000..9ec7cd5e76e Binary files /dev/null and b/public/images/pokemon/variant/icons/4/429_2.png differ diff --git a/public/images/pokemon/variant/icons/4/429_3.png b/public/images/pokemon/variant/icons/4/429_3.png new file mode 100644 index 00000000000..48f7068ced8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/429_3.png differ diff --git a/public/images/pokemon/variant/icons/4/433_1.png b/public/images/pokemon/variant/icons/4/433_1.png new file mode 100644 index 00000000000..04e9fbcaf3a Binary files /dev/null and b/public/images/pokemon/variant/icons/4/433_1.png differ diff --git a/public/images/pokemon/variant/icons/4/433_2.png b/public/images/pokemon/variant/icons/4/433_2.png new file mode 100644 index 00000000000..fbccdb13cd0 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/433_2.png differ diff --git a/public/images/pokemon/variant/icons/4/433_3.png b/public/images/pokemon/variant/icons/4/433_3.png new file mode 100644 index 00000000000..72b3389978f Binary files /dev/null and b/public/images/pokemon/variant/icons/4/433_3.png differ diff --git a/public/images/pokemon/variant/icons/4/440_1.png b/public/images/pokemon/variant/icons/4/440_1.png new file mode 100644 index 00000000000..221f382a21b Binary files /dev/null and b/public/images/pokemon/variant/icons/4/440_1.png differ diff --git a/public/images/pokemon/variant/icons/4/440_2.png b/public/images/pokemon/variant/icons/4/440_2.png new file mode 100644 index 00000000000..13b7a152372 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/440_2.png differ diff --git a/public/images/pokemon/variant/icons/4/440_3.png b/public/images/pokemon/variant/icons/4/440_3.png new file mode 100644 index 00000000000..a97c51cd646 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/440_3.png differ diff --git a/public/images/pokemon/variant/icons/4/442_2.png b/public/images/pokemon/variant/icons/4/442_2.png new file mode 100644 index 00000000000..9859bb7ce98 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/442_2.png differ diff --git a/public/images/pokemon/variant/icons/4/442_3.png b/public/images/pokemon/variant/icons/4/442_3.png new file mode 100644 index 00000000000..d64848ac40d Binary files /dev/null and b/public/images/pokemon/variant/icons/4/442_3.png differ diff --git a/public/images/pokemon/variant/icons/4/443_1.png b/public/images/pokemon/variant/icons/4/443_1.png new file mode 100644 index 00000000000..53d93aab99e Binary files /dev/null and b/public/images/pokemon/variant/icons/4/443_1.png differ diff --git a/public/images/pokemon/variant/icons/4/443_2.png b/public/images/pokemon/variant/icons/4/443_2.png new file mode 100644 index 00000000000..e7dfb3fdb5c Binary files /dev/null and b/public/images/pokemon/variant/icons/4/443_2.png differ diff --git a/public/images/pokemon/variant/icons/4/443_3.png b/public/images/pokemon/variant/icons/4/443_3.png new file mode 100644 index 00000000000..abf81433d96 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/443_3.png differ diff --git a/public/images/pokemon/variant/icons/4/444_1.png b/public/images/pokemon/variant/icons/4/444_1.png new file mode 100644 index 00000000000..1cb56ea2b84 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/444_1.png differ diff --git a/public/images/pokemon/variant/icons/4/444_2.png b/public/images/pokemon/variant/icons/4/444_2.png new file mode 100644 index 00000000000..00c4eefefb4 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/444_2.png differ diff --git a/public/images/pokemon/variant/icons/4/444_3.png b/public/images/pokemon/variant/icons/4/444_3.png new file mode 100644 index 00000000000..477505c805b Binary files /dev/null and b/public/images/pokemon/variant/icons/4/444_3.png differ diff --git a/public/images/pokemon/variant/icons/4/445-mega_1.png b/public/images/pokemon/variant/icons/4/445-mega_1.png new file mode 100644 index 00000000000..ad7b058c3c1 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/445-mega_1.png differ diff --git a/public/images/pokemon/variant/icons/4/445-mega_2.png b/public/images/pokemon/variant/icons/4/445-mega_2.png new file mode 100644 index 00000000000..c7260ae2013 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/445-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/4/445-mega_3.png b/public/images/pokemon/variant/icons/4/445-mega_3.png new file mode 100644 index 00000000000..e05693129d3 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/445-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/4/445_1.png b/public/images/pokemon/variant/icons/4/445_1.png new file mode 100644 index 00000000000..955f80fc48d Binary files /dev/null and b/public/images/pokemon/variant/icons/4/445_1.png differ diff --git a/public/images/pokemon/variant/icons/4/445_2.png b/public/images/pokemon/variant/icons/4/445_2.png new file mode 100644 index 00000000000..aa36c7791af Binary files /dev/null and b/public/images/pokemon/variant/icons/4/445_2.png differ diff --git a/public/images/pokemon/variant/icons/4/445_3.png b/public/images/pokemon/variant/icons/4/445_3.png new file mode 100644 index 00000000000..a0b6ed9cd1d Binary files /dev/null and b/public/images/pokemon/variant/icons/4/445_3.png differ diff --git a/public/images/pokemon/variant/icons/4/447_1.png b/public/images/pokemon/variant/icons/4/447_1.png new file mode 100644 index 00000000000..03173395ac8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/447_1.png differ diff --git a/public/images/pokemon/variant/icons/4/447_2.png b/public/images/pokemon/variant/icons/4/447_2.png new file mode 100644 index 00000000000..3fd9c515de9 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/447_2.png differ diff --git a/public/images/pokemon/variant/icons/4/447_3.png b/public/images/pokemon/variant/icons/4/447_3.png new file mode 100644 index 00000000000..45f1b14a992 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/447_3.png differ diff --git a/public/images/pokemon/variant/icons/4/448-mega_1.png b/public/images/pokemon/variant/icons/4/448-mega_1.png new file mode 100644 index 00000000000..9c694d8915a Binary files /dev/null and b/public/images/pokemon/variant/icons/4/448-mega_1.png differ diff --git a/public/images/pokemon/variant/icons/4/448-mega_2.png b/public/images/pokemon/variant/icons/4/448-mega_2.png new file mode 100644 index 00000000000..2bb37f8df08 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/448-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/4/448-mega_3.png b/public/images/pokemon/variant/icons/4/448-mega_3.png new file mode 100644 index 00000000000..5dbdb78b839 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/448-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/4/448_1.png b/public/images/pokemon/variant/icons/4/448_1.png new file mode 100644 index 00000000000..362927f30c3 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/448_1.png differ diff --git a/public/images/pokemon/variant/icons/4/448_2.png b/public/images/pokemon/variant/icons/4/448_2.png new file mode 100644 index 00000000000..83a9783c4c1 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/448_2.png differ diff --git a/public/images/pokemon/variant/icons/4/448_3.png b/public/images/pokemon/variant/icons/4/448_3.png new file mode 100644 index 00000000000..65684e49bd8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/448_3.png differ diff --git a/public/images/pokemon/variant/icons/4/458_2.png b/public/images/pokemon/variant/icons/4/458_2.png new file mode 100644 index 00000000000..9d4114f8263 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/458_2.png differ diff --git a/public/images/pokemon/variant/icons/4/458_3.png b/public/images/pokemon/variant/icons/4/458_3.png new file mode 100644 index 00000000000..6cf77428ebe Binary files /dev/null and b/public/images/pokemon/variant/icons/4/458_3.png differ diff --git a/public/images/pokemon/variant/icons/4/466_1.png b/public/images/pokemon/variant/icons/4/466_1.png new file mode 100644 index 00000000000..32423eb1384 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/466_1.png differ diff --git a/public/images/pokemon/variant/icons/4/466_2.png b/public/images/pokemon/variant/icons/4/466_2.png new file mode 100644 index 00000000000..0d39f0798c7 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/466_2.png differ diff --git a/public/images/pokemon/variant/icons/4/466_3.png b/public/images/pokemon/variant/icons/4/466_3.png new file mode 100644 index 00000000000..eca9ef7724c Binary files /dev/null and b/public/images/pokemon/variant/icons/4/466_3.png differ diff --git a/public/images/pokemon/variant/icons/4/468_1.png b/public/images/pokemon/variant/icons/4/468_1.png new file mode 100644 index 00000000000..686326a1aa8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/468_1.png differ diff --git a/public/images/pokemon/variant/icons/4/468_2.png b/public/images/pokemon/variant/icons/4/468_2.png new file mode 100644 index 00000000000..96f525ce43e Binary files /dev/null and b/public/images/pokemon/variant/icons/4/468_2.png differ diff --git a/public/images/pokemon/variant/icons/4/468_3.png b/public/images/pokemon/variant/icons/4/468_3.png new file mode 100644 index 00000000000..7e907f3eae3 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/468_3.png differ diff --git a/public/images/pokemon/variant/icons/4/470_1.png b/public/images/pokemon/variant/icons/4/470_1.png new file mode 100644 index 00000000000..4ba723592e3 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/470_1.png differ diff --git a/public/images/pokemon/variant/icons/4/470_2.png b/public/images/pokemon/variant/icons/4/470_2.png new file mode 100644 index 00000000000..87324b2666a Binary files /dev/null and b/public/images/pokemon/variant/icons/4/470_2.png differ diff --git a/public/images/pokemon/variant/icons/4/470_3.png b/public/images/pokemon/variant/icons/4/470_3.png new file mode 100644 index 00000000000..421ce166559 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/470_3.png differ diff --git a/public/images/pokemon/variant/icons/4/471_1.png b/public/images/pokemon/variant/icons/4/471_1.png new file mode 100644 index 00000000000..d37a7515a00 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/471_1.png differ diff --git a/public/images/pokemon/variant/icons/4/471_2.png b/public/images/pokemon/variant/icons/4/471_2.png new file mode 100644 index 00000000000..429544cc591 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/471_2.png differ diff --git a/public/images/pokemon/variant/icons/4/471_3.png b/public/images/pokemon/variant/icons/4/471_3.png new file mode 100644 index 00000000000..95b8e481818 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/471_3.png differ diff --git a/public/images/pokemon/variant/icons/4/475-mega_2.png b/public/images/pokemon/variant/icons/4/475-mega_2.png new file mode 100644 index 00000000000..91978784c80 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/475-mega_2.png differ diff --git a/public/images/pokemon/variant/icons/4/475-mega_3.png b/public/images/pokemon/variant/icons/4/475-mega_3.png new file mode 100644 index 00000000000..af231e2fc3b Binary files /dev/null and b/public/images/pokemon/variant/icons/4/475-mega_3.png differ diff --git a/public/images/pokemon/variant/icons/4/475_2.png b/public/images/pokemon/variant/icons/4/475_2.png new file mode 100644 index 00000000000..4bfe88f1f88 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/475_2.png differ diff --git a/public/images/pokemon/variant/icons/4/475_3.png b/public/images/pokemon/variant/icons/4/475_3.png new file mode 100644 index 00000000000..8bc62d70b0f Binary files /dev/null and b/public/images/pokemon/variant/icons/4/475_3.png differ diff --git a/public/images/pokemon/variant/icons/4/480_1.png b/public/images/pokemon/variant/icons/4/480_1.png new file mode 100644 index 00000000000..3b9a496e3f9 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/480_1.png differ diff --git a/public/images/pokemon/variant/icons/4/480_2.png b/public/images/pokemon/variant/icons/4/480_2.png new file mode 100644 index 00000000000..5db1971cb61 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/480_2.png differ diff --git a/public/images/pokemon/variant/icons/4/480_3.png b/public/images/pokemon/variant/icons/4/480_3.png new file mode 100644 index 00000000000..e7ca3ff5bc8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/480_3.png differ diff --git a/public/images/pokemon/variant/icons/4/481_1.png b/public/images/pokemon/variant/icons/4/481_1.png new file mode 100644 index 00000000000..382851af42b Binary files /dev/null and b/public/images/pokemon/variant/icons/4/481_1.png differ diff --git a/public/images/pokemon/variant/icons/4/481_2.png b/public/images/pokemon/variant/icons/4/481_2.png new file mode 100644 index 00000000000..8c62541d898 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/481_2.png differ diff --git a/public/images/pokemon/variant/icons/4/481_3.png b/public/images/pokemon/variant/icons/4/481_3.png new file mode 100644 index 00000000000..c42845e9ed7 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/481_3.png differ diff --git a/public/images/pokemon/variant/icons/4/482_1.png b/public/images/pokemon/variant/icons/4/482_1.png new file mode 100644 index 00000000000..3e479c3c1c6 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/482_1.png differ diff --git a/public/images/pokemon/variant/icons/4/482_2.png b/public/images/pokemon/variant/icons/4/482_2.png new file mode 100644 index 00000000000..a636973b33a Binary files /dev/null and b/public/images/pokemon/variant/icons/4/482_2.png differ diff --git a/public/images/pokemon/variant/icons/4/482_3.png b/public/images/pokemon/variant/icons/4/482_3.png new file mode 100644 index 00000000000..28ec6f85f47 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/482_3.png differ diff --git a/public/images/pokemon/variant/icons/4/485_3.png b/public/images/pokemon/variant/icons/4/485_3.png new file mode 100644 index 00000000000..2f133e8fb98 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/485_3.png differ diff --git a/public/images/pokemon/variant/icons/4/487-altered_2.png b/public/images/pokemon/variant/icons/4/487-altered_2.png new file mode 100644 index 00000000000..d9cbea5e323 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/487-altered_2.png differ diff --git a/public/images/pokemon/variant/icons/4/487-altered_3.png b/public/images/pokemon/variant/icons/4/487-altered_3.png new file mode 100644 index 00000000000..59169ab9de8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/487-altered_3.png differ diff --git a/public/images/pokemon/variant/icons/4/487-origin_2.png b/public/images/pokemon/variant/icons/4/487-origin_2.png new file mode 100644 index 00000000000..61f322ac409 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/487-origin_2.png differ diff --git a/public/images/pokemon/variant/icons/4/487-origin_3.png b/public/images/pokemon/variant/icons/4/487-origin_3.png new file mode 100644 index 00000000000..e8fe8f61634 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/487-origin_3.png differ diff --git a/public/images/pokemon/variant/icons/4/488_2.png b/public/images/pokemon/variant/icons/4/488_2.png new file mode 100644 index 00000000000..400a2d2d065 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/488_2.png differ diff --git a/public/images/pokemon/variant/icons/4/488_3.png b/public/images/pokemon/variant/icons/4/488_3.png new file mode 100644 index 00000000000..595ceb54f82 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/488_3.png differ diff --git a/public/images/pokemon/variant/icons/4/489_1.png b/public/images/pokemon/variant/icons/4/489_1.png new file mode 100644 index 00000000000..9cb6e03888a Binary files /dev/null and b/public/images/pokemon/variant/icons/4/489_1.png differ diff --git a/public/images/pokemon/variant/icons/4/489_2.png b/public/images/pokemon/variant/icons/4/489_2.png new file mode 100644 index 00000000000..b4e32fe5259 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/489_2.png differ diff --git a/public/images/pokemon/variant/icons/4/489_3.png b/public/images/pokemon/variant/icons/4/489_3.png new file mode 100644 index 00000000000..428156638bf Binary files /dev/null and b/public/images/pokemon/variant/icons/4/489_3.png differ diff --git a/public/images/pokemon/variant/icons/4/490_1.png b/public/images/pokemon/variant/icons/4/490_1.png new file mode 100644 index 00000000000..1fda8d15b43 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/490_1.png differ diff --git a/public/images/pokemon/variant/icons/4/490_2.png b/public/images/pokemon/variant/icons/4/490_2.png new file mode 100644 index 00000000000..b9014e88e18 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/490_2.png differ diff --git a/public/images/pokemon/variant/icons/4/490_3.png b/public/images/pokemon/variant/icons/4/490_3.png new file mode 100644 index 00000000000..87a055c99e0 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/490_3.png differ diff --git a/public/images/pokemon/variant/icons/4/491_2.png b/public/images/pokemon/variant/icons/4/491_2.png new file mode 100644 index 00000000000..e5e8ed579be Binary files /dev/null and b/public/images/pokemon/variant/icons/4/491_2.png differ diff --git a/public/images/pokemon/variant/icons/4/491_3.png b/public/images/pokemon/variant/icons/4/491_3.png new file mode 100644 index 00000000000..630f7c57c09 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/491_3.png differ diff --git a/public/images/pokemon/variant/icons/4/492-land_2.png b/public/images/pokemon/variant/icons/4/492-land_2.png new file mode 100644 index 00000000000..fdb71a83687 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/492-land_2.png differ diff --git a/public/images/pokemon/variant/icons/4/492-land_3.png b/public/images/pokemon/variant/icons/4/492-land_3.png new file mode 100644 index 00000000000..0262fb96375 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/492-land_3.png differ diff --git a/public/images/pokemon/variant/icons/4/492-sky_2.png b/public/images/pokemon/variant/icons/4/492-sky_2.png new file mode 100644 index 00000000000..6c704ab6089 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/492-sky_2.png differ diff --git a/public/images/pokemon/variant/icons/4/492-sky_3.png b/public/images/pokemon/variant/icons/4/492-sky_3.png new file mode 100644 index 00000000000..bd18e72a73d Binary files /dev/null and b/public/images/pokemon/variant/icons/4/492-sky_3.png differ diff --git a/public/images/pokemon/variant/icons/4/494_2.png b/public/images/pokemon/variant/icons/4/494_2.png new file mode 100644 index 00000000000..bf0c810d1f8 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/494_2.png differ diff --git a/public/images/pokemon/variant/icons/4/494_3.png b/public/images/pokemon/variant/icons/4/494_3.png new file mode 100644 index 00000000000..49a0c349338 Binary files /dev/null and b/public/images/pokemon/variant/icons/4/494_3.png differ diff --git a/public/images/pokemon/variant/icons/5/495_2.png b/public/images/pokemon/variant/icons/5/495_2.png new file mode 100644 index 00000000000..f25803707c5 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/495_2.png differ diff --git a/public/images/pokemon/variant/icons/5/495_3.png b/public/images/pokemon/variant/icons/5/495_3.png new file mode 100644 index 00000000000..f8aa4640b94 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/495_3.png differ diff --git a/public/images/pokemon/variant/icons/5/496_2.png b/public/images/pokemon/variant/icons/5/496_2.png new file mode 100644 index 00000000000..7afe5afd0d8 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/496_2.png differ diff --git a/public/images/pokemon/variant/icons/5/496_3.png b/public/images/pokemon/variant/icons/5/496_3.png new file mode 100644 index 00000000000..bcda92b7564 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/496_3.png differ diff --git a/public/images/pokemon/variant/icons/5/497_2.png b/public/images/pokemon/variant/icons/5/497_2.png new file mode 100644 index 00000000000..ab85a310ff6 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/497_2.png differ diff --git a/public/images/pokemon/variant/icons/5/497_3.png b/public/images/pokemon/variant/icons/5/497_3.png new file mode 100644 index 00000000000..d901b5060d3 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/497_3.png differ diff --git a/public/images/pokemon/variant/icons/5/532_2.png b/public/images/pokemon/variant/icons/5/532_2.png new file mode 100644 index 00000000000..81c5ccccd02 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/532_2.png differ diff --git a/public/images/pokemon/variant/icons/5/532_3.png b/public/images/pokemon/variant/icons/5/532_3.png new file mode 100644 index 00000000000..276b7da7bac Binary files /dev/null and b/public/images/pokemon/variant/icons/5/532_3.png differ diff --git a/public/images/pokemon/variant/icons/5/533_2.png b/public/images/pokemon/variant/icons/5/533_2.png new file mode 100644 index 00000000000..0a0e58b5af5 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/533_2.png differ diff --git a/public/images/pokemon/variant/icons/5/533_3.png b/public/images/pokemon/variant/icons/5/533_3.png new file mode 100644 index 00000000000..abfa6b61c91 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/533_3.png differ diff --git a/public/images/pokemon/variant/icons/5/534_2.png b/public/images/pokemon/variant/icons/5/534_2.png new file mode 100644 index 00000000000..19a37ec320e Binary files /dev/null and b/public/images/pokemon/variant/icons/5/534_2.png differ diff --git a/public/images/pokemon/variant/icons/5/534_3.png b/public/images/pokemon/variant/icons/5/534_3.png new file mode 100644 index 00000000000..bb5716edede Binary files /dev/null and b/public/images/pokemon/variant/icons/5/534_3.png differ diff --git a/public/images/pokemon/variant/icons/5/538_2.png b/public/images/pokemon/variant/icons/5/538_2.png new file mode 100644 index 00000000000..cce9492da40 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/538_2.png differ diff --git a/public/images/pokemon/variant/icons/5/538_3.png b/public/images/pokemon/variant/icons/5/538_3.png new file mode 100644 index 00000000000..6167c7fbdcd Binary files /dev/null and b/public/images/pokemon/variant/icons/5/538_3.png differ diff --git a/public/images/pokemon/variant/icons/5/540_2.png b/public/images/pokemon/variant/icons/5/540_2.png new file mode 100644 index 00000000000..26123ac72c3 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/540_2.png differ diff --git a/public/images/pokemon/variant/icons/5/540_3.png b/public/images/pokemon/variant/icons/5/540_3.png new file mode 100644 index 00000000000..3089a82cb9d Binary files /dev/null and b/public/images/pokemon/variant/icons/5/540_3.png differ diff --git a/public/images/pokemon/variant/icons/5/541_2.png b/public/images/pokemon/variant/icons/5/541_2.png new file mode 100644 index 00000000000..6e14cea1d65 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/541_2.png differ diff --git a/public/images/pokemon/variant/icons/5/541_3.png b/public/images/pokemon/variant/icons/5/541_3.png new file mode 100644 index 00000000000..f691017ebc6 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/541_3.png differ diff --git a/public/images/pokemon/variant/icons/5/542_2.png b/public/images/pokemon/variant/icons/5/542_2.png new file mode 100644 index 00000000000..c6fab880eee Binary files /dev/null and b/public/images/pokemon/variant/icons/5/542_2.png differ diff --git a/public/images/pokemon/variant/icons/5/542_3.png b/public/images/pokemon/variant/icons/5/542_3.png new file mode 100644 index 00000000000..ed2c5a0dbef Binary files /dev/null and b/public/images/pokemon/variant/icons/5/542_3.png differ diff --git a/public/images/pokemon/variant/icons/5/546_2.png b/public/images/pokemon/variant/icons/5/546_2.png new file mode 100644 index 00000000000..e5db5b4f74f Binary files /dev/null and b/public/images/pokemon/variant/icons/5/546_2.png differ diff --git a/public/images/pokemon/variant/icons/5/546_3.png b/public/images/pokemon/variant/icons/5/546_3.png new file mode 100644 index 00000000000..126bd405d95 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/546_3.png differ diff --git a/public/images/pokemon/variant/icons/5/547_2.png b/public/images/pokemon/variant/icons/5/547_2.png new file mode 100644 index 00000000000..2294b11332a Binary files /dev/null and b/public/images/pokemon/variant/icons/5/547_2.png differ diff --git a/public/images/pokemon/variant/icons/5/547_3.png b/public/images/pokemon/variant/icons/5/547_3.png new file mode 100644 index 00000000000..1af57cc099a Binary files /dev/null and b/public/images/pokemon/variant/icons/5/547_3.png differ diff --git a/public/images/pokemon/variant/icons/5/548_1.png b/public/images/pokemon/variant/icons/5/548_1.png new file mode 100644 index 00000000000..ee99f5110f2 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/548_1.png differ diff --git a/public/images/pokemon/variant/icons/5/548_2.png b/public/images/pokemon/variant/icons/5/548_2.png new file mode 100644 index 00000000000..aafa94dc525 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/548_2.png differ diff --git a/public/images/pokemon/variant/icons/5/548_3.png b/public/images/pokemon/variant/icons/5/548_3.png new file mode 100644 index 00000000000..4b31b7c0bdd Binary files /dev/null and b/public/images/pokemon/variant/icons/5/548_3.png differ diff --git a/public/images/pokemon/variant/icons/5/549_2.png b/public/images/pokemon/variant/icons/5/549_2.png new file mode 100644 index 00000000000..9dbb35707b5 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/549_2.png differ diff --git a/public/images/pokemon/variant/icons/5/549_3.png b/public/images/pokemon/variant/icons/5/549_3.png new file mode 100644 index 00000000000..ef8dba0f5be Binary files /dev/null and b/public/images/pokemon/variant/icons/5/549_3.png differ diff --git a/public/images/pokemon/variant/icons/5/559_1.png b/public/images/pokemon/variant/icons/5/559_1.png new file mode 100644 index 00000000000..806899a722d Binary files /dev/null and b/public/images/pokemon/variant/icons/5/559_1.png differ diff --git a/public/images/pokemon/variant/icons/5/559_2.png b/public/images/pokemon/variant/icons/5/559_2.png new file mode 100644 index 00000000000..3323fc8c12f Binary files /dev/null and b/public/images/pokemon/variant/icons/5/559_2.png differ diff --git a/public/images/pokemon/variant/icons/5/559_3.png b/public/images/pokemon/variant/icons/5/559_3.png new file mode 100644 index 00000000000..fdbb6f60687 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/559_3.png differ diff --git a/public/images/pokemon/variant/icons/5/560_1.png b/public/images/pokemon/variant/icons/5/560_1.png new file mode 100644 index 00000000000..1cdbe72ed94 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/560_1.png differ diff --git a/public/images/pokemon/variant/icons/5/560_2.png b/public/images/pokemon/variant/icons/5/560_2.png new file mode 100644 index 00000000000..8dcf14f9494 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/560_2.png differ diff --git a/public/images/pokemon/variant/icons/5/560_3.png b/public/images/pokemon/variant/icons/5/560_3.png new file mode 100644 index 00000000000..10351746c23 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/560_3.png differ diff --git a/public/images/pokemon/variant/icons/5/562_2.png b/public/images/pokemon/variant/icons/5/562_2.png new file mode 100644 index 00000000000..93b69b1b0d3 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/562_2.png differ diff --git a/public/images/pokemon/variant/icons/5/562_3.png b/public/images/pokemon/variant/icons/5/562_3.png new file mode 100644 index 00000000000..094cf780759 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/562_3.png differ diff --git a/public/images/pokemon/variant/icons/5/563_2.png b/public/images/pokemon/variant/icons/5/563_2.png new file mode 100644 index 00000000000..f29fa7cca6c Binary files /dev/null and b/public/images/pokemon/variant/icons/5/563_2.png differ diff --git a/public/images/pokemon/variant/icons/5/563_3.png b/public/images/pokemon/variant/icons/5/563_3.png new file mode 100644 index 00000000000..ae3bf60d3b3 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/563_3.png differ diff --git a/public/images/pokemon/variant/icons/5/570_2.png b/public/images/pokemon/variant/icons/5/570_2.png new file mode 100644 index 00000000000..c72fb971f4a Binary files /dev/null and b/public/images/pokemon/variant/icons/5/570_2.png differ diff --git a/public/images/pokemon/variant/icons/5/570_3.png b/public/images/pokemon/variant/icons/5/570_3.png new file mode 100644 index 00000000000..d68ea4261b7 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/570_3.png differ diff --git a/public/images/pokemon/variant/icons/5/571_2.png b/public/images/pokemon/variant/icons/5/571_2.png new file mode 100644 index 00000000000..1e238ee619d Binary files /dev/null and b/public/images/pokemon/variant/icons/5/571_2.png differ diff --git a/public/images/pokemon/variant/icons/5/571_3.png b/public/images/pokemon/variant/icons/5/571_3.png new file mode 100644 index 00000000000..528bfc4b719 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/571_3.png differ diff --git a/public/images/pokemon/variant/icons/5/572_2.png b/public/images/pokemon/variant/icons/5/572_2.png new file mode 100644 index 00000000000..b6230a17cbc Binary files /dev/null and b/public/images/pokemon/variant/icons/5/572_2.png differ diff --git a/public/images/pokemon/variant/icons/5/572_3.png b/public/images/pokemon/variant/icons/5/572_3.png new file mode 100644 index 00000000000..c0848deade2 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/572_3.png differ diff --git a/public/images/pokemon/variant/icons/5/577_1.png b/public/images/pokemon/variant/icons/5/577_1.png new file mode 100644 index 00000000000..16f8a4d6640 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/577_1.png differ diff --git a/public/images/pokemon/variant/icons/5/577_2.png b/public/images/pokemon/variant/icons/5/577_2.png new file mode 100644 index 00000000000..ac85ca5f5c3 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/577_2.png differ diff --git a/public/images/pokemon/variant/icons/5/577_3.png b/public/images/pokemon/variant/icons/5/577_3.png new file mode 100644 index 00000000000..e2d68729a1b Binary files /dev/null and b/public/images/pokemon/variant/icons/5/577_3.png differ diff --git a/public/images/pokemon/variant/icons/5/578_1.png b/public/images/pokemon/variant/icons/5/578_1.png new file mode 100644 index 00000000000..71364650cbb Binary files /dev/null and b/public/images/pokemon/variant/icons/5/578_1.png differ diff --git a/public/images/pokemon/variant/icons/5/578_2.png b/public/images/pokemon/variant/icons/5/578_2.png new file mode 100644 index 00000000000..7b3a54b60ce Binary files /dev/null and b/public/images/pokemon/variant/icons/5/578_2.png differ diff --git a/public/images/pokemon/variant/icons/5/578_3.png b/public/images/pokemon/variant/icons/5/578_3.png new file mode 100644 index 00000000000..27e53e15336 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/578_3.png differ diff --git a/public/images/pokemon/variant/icons/5/579_1.png b/public/images/pokemon/variant/icons/5/579_1.png new file mode 100644 index 00000000000..18a57ba8742 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/579_1.png differ diff --git a/public/images/pokemon/variant/icons/5/579_2.png b/public/images/pokemon/variant/icons/5/579_2.png new file mode 100644 index 00000000000..7424adf1e60 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/579_2.png differ diff --git a/public/images/pokemon/variant/icons/5/579_3.png b/public/images/pokemon/variant/icons/5/579_3.png new file mode 100644 index 00000000000..af642842fac Binary files /dev/null and b/public/images/pokemon/variant/icons/5/579_3.png differ diff --git a/public/images/pokemon/variant/icons/5/585-autumn_1.png b/public/images/pokemon/variant/icons/5/585-autumn_1.png new file mode 100644 index 00000000000..90b61383f4f Binary files /dev/null and b/public/images/pokemon/variant/icons/5/585-autumn_1.png differ diff --git a/public/images/pokemon/variant/icons/5/585-spring_1.png b/public/images/pokemon/variant/icons/5/585-spring_1.png new file mode 100644 index 00000000000..0abf9205f97 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/585-spring_1.png differ diff --git a/public/images/pokemon/variant/icons/5/585-summer_1.png b/public/images/pokemon/variant/icons/5/585-summer_1.png new file mode 100644 index 00000000000..23884ba1548 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/585-summer_1.png differ diff --git a/public/images/pokemon/variant/icons/5/585-winter_1.png b/public/images/pokemon/variant/icons/5/585-winter_1.png new file mode 100644 index 00000000000..433405e8449 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/585-winter_1.png differ diff --git a/public/images/pokemon/variant/icons/5/586-autumn_1.png b/public/images/pokemon/variant/icons/5/586-autumn_1.png new file mode 100644 index 00000000000..5b18f2ed37d Binary files /dev/null and b/public/images/pokemon/variant/icons/5/586-autumn_1.png differ diff --git a/public/images/pokemon/variant/icons/5/586-spring_1.png b/public/images/pokemon/variant/icons/5/586-spring_1.png new file mode 100644 index 00000000000..dad8e5491d6 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/586-spring_1.png differ diff --git a/public/images/pokemon/variant/icons/5/586-summer_1.png b/public/images/pokemon/variant/icons/5/586-summer_1.png new file mode 100644 index 00000000000..e837a8d7efd Binary files /dev/null and b/public/images/pokemon/variant/icons/5/586-summer_1.png differ diff --git a/public/images/pokemon/variant/icons/5/586-winter_1.png b/public/images/pokemon/variant/icons/5/586-winter_1.png new file mode 100644 index 00000000000..b5518e19b32 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/586-winter_1.png differ diff --git a/public/images/pokemon/variant/icons/5/595_2.png b/public/images/pokemon/variant/icons/5/595_2.png new file mode 100644 index 00000000000..88822ea7d41 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/595_2.png differ diff --git a/public/images/pokemon/variant/icons/5/595_3.png b/public/images/pokemon/variant/icons/5/595_3.png new file mode 100644 index 00000000000..99dc686d2c9 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/595_3.png differ diff --git a/public/images/pokemon/variant/icons/5/596_2.png b/public/images/pokemon/variant/icons/5/596_2.png new file mode 100644 index 00000000000..1e8c77ede8e Binary files /dev/null and b/public/images/pokemon/variant/icons/5/596_2.png differ diff --git a/public/images/pokemon/variant/icons/5/596_3.png b/public/images/pokemon/variant/icons/5/596_3.png new file mode 100644 index 00000000000..a01217c6099 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/596_3.png differ diff --git a/public/images/pokemon/variant/icons/5/607_2.png b/public/images/pokemon/variant/icons/5/607_2.png new file mode 100644 index 00000000000..38725cd18e6 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/607_2.png differ diff --git a/public/images/pokemon/variant/icons/5/607_3.png b/public/images/pokemon/variant/icons/5/607_3.png new file mode 100644 index 00000000000..be0d7109aaa Binary files /dev/null and b/public/images/pokemon/variant/icons/5/607_3.png differ diff --git a/public/images/pokemon/variant/icons/5/608_2.png b/public/images/pokemon/variant/icons/5/608_2.png new file mode 100644 index 00000000000..69aebb4cc86 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/608_2.png differ diff --git a/public/images/pokemon/variant/icons/5/608_3.png b/public/images/pokemon/variant/icons/5/608_3.png new file mode 100644 index 00000000000..df55f56a395 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/608_3.png differ diff --git a/public/images/pokemon/variant/icons/5/609_2.png b/public/images/pokemon/variant/icons/5/609_2.png new file mode 100644 index 00000000000..8a8aac30577 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/609_2.png differ diff --git a/public/images/pokemon/variant/icons/5/609_3.png b/public/images/pokemon/variant/icons/5/609_3.png new file mode 100644 index 00000000000..93ed2232830 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/609_3.png differ diff --git a/public/images/pokemon/variant/icons/5/610_2.png b/public/images/pokemon/variant/icons/5/610_2.png new file mode 100644 index 00000000000..f9e05990a3b Binary files /dev/null and b/public/images/pokemon/variant/icons/5/610_2.png differ diff --git a/public/images/pokemon/variant/icons/5/610_3.png b/public/images/pokemon/variant/icons/5/610_3.png new file mode 100644 index 00000000000..8441185abe0 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/610_3.png differ diff --git a/public/images/pokemon/variant/icons/5/611_2.png b/public/images/pokemon/variant/icons/5/611_2.png new file mode 100644 index 00000000000..33f05993d2a Binary files /dev/null and b/public/images/pokemon/variant/icons/5/611_2.png differ diff --git a/public/images/pokemon/variant/icons/5/611_3.png b/public/images/pokemon/variant/icons/5/611_3.png new file mode 100644 index 00000000000..c4d95a35edf Binary files /dev/null and b/public/images/pokemon/variant/icons/5/611_3.png differ diff --git a/public/images/pokemon/variant/icons/5/612_2.png b/public/images/pokemon/variant/icons/5/612_2.png new file mode 100644 index 00000000000..b17eec305d7 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/612_2.png differ diff --git a/public/images/pokemon/variant/icons/5/612_3.png b/public/images/pokemon/variant/icons/5/612_3.png new file mode 100644 index 00000000000..dd25ae40a21 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/612_3.png differ diff --git a/public/images/pokemon/variant/icons/5/622_2.png b/public/images/pokemon/variant/icons/5/622_2.png new file mode 100644 index 00000000000..96e5ad16cf5 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/622_2.png differ diff --git a/public/images/pokemon/variant/icons/5/622_3.png b/public/images/pokemon/variant/icons/5/622_3.png new file mode 100644 index 00000000000..6575393112c Binary files /dev/null and b/public/images/pokemon/variant/icons/5/622_3.png differ diff --git a/public/images/pokemon/variant/icons/5/623_2.png b/public/images/pokemon/variant/icons/5/623_2.png new file mode 100644 index 00000000000..c024a510326 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/623_2.png differ diff --git a/public/images/pokemon/variant/icons/5/623_3.png b/public/images/pokemon/variant/icons/5/623_3.png new file mode 100644 index 00000000000..88002cd0017 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/623_3.png differ diff --git a/public/images/pokemon/variant/icons/5/632_2.png b/public/images/pokemon/variant/icons/5/632_2.png new file mode 100644 index 00000000000..8146d54a410 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/632_2.png differ diff --git a/public/images/pokemon/variant/icons/5/632_3.png b/public/images/pokemon/variant/icons/5/632_3.png new file mode 100644 index 00000000000..786ebef54e5 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/632_3.png differ diff --git a/public/images/pokemon/variant/icons/5/633_2.png b/public/images/pokemon/variant/icons/5/633_2.png new file mode 100644 index 00000000000..3c6757ceb02 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/633_2.png differ diff --git a/public/images/pokemon/variant/icons/5/633_3.png b/public/images/pokemon/variant/icons/5/633_3.png new file mode 100644 index 00000000000..d14fa5e9da8 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/633_3.png differ diff --git a/public/images/pokemon/variant/icons/5/634_2.png b/public/images/pokemon/variant/icons/5/634_2.png new file mode 100644 index 00000000000..35fa482f3b4 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/634_2.png differ diff --git a/public/images/pokemon/variant/icons/5/634_3.png b/public/images/pokemon/variant/icons/5/634_3.png new file mode 100644 index 00000000000..4f3ed3238e0 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/634_3.png differ diff --git a/public/images/pokemon/variant/icons/5/635_2.png b/public/images/pokemon/variant/icons/5/635_2.png new file mode 100644 index 00000000000..c46af2fb65a Binary files /dev/null and b/public/images/pokemon/variant/icons/5/635_2.png differ diff --git a/public/images/pokemon/variant/icons/5/635_3.png b/public/images/pokemon/variant/icons/5/635_3.png new file mode 100644 index 00000000000..0d64cac9c81 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/635_3.png differ diff --git a/public/images/pokemon/variant/icons/5/636_2.png b/public/images/pokemon/variant/icons/5/636_2.png new file mode 100644 index 00000000000..92d0630247a Binary files /dev/null and b/public/images/pokemon/variant/icons/5/636_2.png differ diff --git a/public/images/pokemon/variant/icons/5/636_3.png b/public/images/pokemon/variant/icons/5/636_3.png new file mode 100644 index 00000000000..a1a32a6e586 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/636_3.png differ diff --git a/public/images/pokemon/variant/icons/5/637_2.png b/public/images/pokemon/variant/icons/5/637_2.png new file mode 100644 index 00000000000..95ad5481f5c Binary files /dev/null and b/public/images/pokemon/variant/icons/5/637_2.png differ diff --git a/public/images/pokemon/variant/icons/5/637_3.png b/public/images/pokemon/variant/icons/5/637_3.png new file mode 100644 index 00000000000..a8c4c932367 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/637_3.png differ diff --git a/public/images/pokemon/variant/icons/5/641-incarnate_1.png b/public/images/pokemon/variant/icons/5/641-incarnate_1.png new file mode 100644 index 00000000000..ddd0ca15c0c Binary files /dev/null and b/public/images/pokemon/variant/icons/5/641-incarnate_1.png differ diff --git a/public/images/pokemon/variant/icons/5/641-therian_1.png b/public/images/pokemon/variant/icons/5/641-therian_1.png new file mode 100644 index 00000000000..8f6f01fd0d7 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/641-therian_1.png differ diff --git a/public/images/pokemon/variant/icons/5/642-incarnate_1.png b/public/images/pokemon/variant/icons/5/642-incarnate_1.png new file mode 100644 index 00000000000..55507be70b9 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/642-incarnate_1.png differ diff --git a/public/images/pokemon/variant/icons/5/642-therian_1.png b/public/images/pokemon/variant/icons/5/642-therian_1.png new file mode 100644 index 00000000000..bea360abb95 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/642-therian_1.png differ diff --git a/public/images/pokemon/variant/icons/5/645-incarnate_1.png b/public/images/pokemon/variant/icons/5/645-incarnate_1.png new file mode 100644 index 00000000000..416fa9ca1db Binary files /dev/null and b/public/images/pokemon/variant/icons/5/645-incarnate_1.png differ diff --git a/public/images/pokemon/variant/icons/5/645-therian_1.png b/public/images/pokemon/variant/icons/5/645-therian_1.png new file mode 100644 index 00000000000..c03d4233e29 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/645-therian_1.png differ diff --git a/public/images/pokemon/variant/icons/5/648-aria_2.png b/public/images/pokemon/variant/icons/5/648-aria_2.png new file mode 100644 index 00000000000..4992e1c3006 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/648-aria_2.png differ diff --git a/public/images/pokemon/variant/icons/5/648-aria_3.png b/public/images/pokemon/variant/icons/5/648-aria_3.png new file mode 100644 index 00000000000..55d8e658d63 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/648-aria_3.png differ diff --git a/public/images/pokemon/variant/icons/5/648-pirouette_2.png b/public/images/pokemon/variant/icons/5/648-pirouette_2.png new file mode 100644 index 00000000000..8b1db1a5519 Binary files /dev/null and b/public/images/pokemon/variant/icons/5/648-pirouette_2.png differ diff --git a/public/images/pokemon/variant/icons/5/648-pirouette_3.png b/public/images/pokemon/variant/icons/5/648-pirouette_3.png new file mode 100644 index 00000000000..874ccfae7cc Binary files /dev/null and b/public/images/pokemon/variant/icons/5/648-pirouette_3.png differ diff --git a/public/images/pokemon/variant/icons/6/653_2.png b/public/images/pokemon/variant/icons/6/653_2.png new file mode 100644 index 00000000000..74fc7fe34fa Binary files /dev/null and b/public/images/pokemon/variant/icons/6/653_2.png differ diff --git a/public/images/pokemon/variant/icons/6/653_3.png b/public/images/pokemon/variant/icons/6/653_3.png new file mode 100644 index 00000000000..0a1b589e244 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/653_3.png differ diff --git a/public/images/pokemon/variant/icons/6/654_2.png b/public/images/pokemon/variant/icons/6/654_2.png new file mode 100644 index 00000000000..ca0060cab01 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/654_2.png differ diff --git a/public/images/pokemon/variant/icons/6/654_3.png b/public/images/pokemon/variant/icons/6/654_3.png new file mode 100644 index 00000000000..489faa127ac Binary files /dev/null and b/public/images/pokemon/variant/icons/6/654_3.png differ diff --git a/public/images/pokemon/variant/icons/6/655_2.png b/public/images/pokemon/variant/icons/6/655_2.png new file mode 100644 index 00000000000..0e99195d0d8 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/655_2.png differ diff --git a/public/images/pokemon/variant/icons/6/655_3.png b/public/images/pokemon/variant/icons/6/655_3.png new file mode 100644 index 00000000000..6e340b68616 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/655_3.png differ diff --git a/public/images/pokemon/variant/icons/6/664_2.png b/public/images/pokemon/variant/icons/6/664_2.png new file mode 100644 index 00000000000..7453776377e Binary files /dev/null and b/public/images/pokemon/variant/icons/6/664_2.png differ diff --git a/public/images/pokemon/variant/icons/6/664_3.png b/public/images/pokemon/variant/icons/6/664_3.png new file mode 100644 index 00000000000..def900f8b7f Binary files /dev/null and b/public/images/pokemon/variant/icons/6/664_3.png differ diff --git a/public/images/pokemon/variant/icons/6/665_2.png b/public/images/pokemon/variant/icons/6/665_2.png new file mode 100644 index 00000000000..36f66b5edd4 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/665_2.png differ diff --git a/public/images/pokemon/variant/icons/6/665_3.png b/public/images/pokemon/variant/icons/6/665_3.png new file mode 100644 index 00000000000..e8a449d6606 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/665_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-archipelago_2.png b/public/images/pokemon/variant/icons/6/666-archipelago_2.png new file mode 100644 index 00000000000..31059899487 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-archipelago_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-archipelago_3.png b/public/images/pokemon/variant/icons/6/666-archipelago_3.png new file mode 100644 index 00000000000..6552b345b4e Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-archipelago_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-continental_2.png b/public/images/pokemon/variant/icons/6/666-continental_2.png new file mode 100644 index 00000000000..13a3f762c92 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-continental_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-continental_3.png b/public/images/pokemon/variant/icons/6/666-continental_3.png new file mode 100644 index 00000000000..4975a8f5c15 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-continental_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-elegant_2.png b/public/images/pokemon/variant/icons/6/666-elegant_2.png new file mode 100644 index 00000000000..8b94fed05b3 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-elegant_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-elegant_3.png b/public/images/pokemon/variant/icons/6/666-elegant_3.png new file mode 100644 index 00000000000..55de693caf5 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-elegant_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-fancy_2.png b/public/images/pokemon/variant/icons/6/666-fancy_2.png new file mode 100644 index 00000000000..ebaf181b305 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-fancy_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-fancy_3.png b/public/images/pokemon/variant/icons/6/666-fancy_3.png new file mode 100644 index 00000000000..9da7e479fb0 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-fancy_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-garden_2.png b/public/images/pokemon/variant/icons/6/666-garden_2.png new file mode 100644 index 00000000000..43fe4c217cf Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-garden_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-garden_3.png b/public/images/pokemon/variant/icons/6/666-garden_3.png new file mode 100644 index 00000000000..ba41f22906a Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-garden_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-high-plains_2.png b/public/images/pokemon/variant/icons/6/666-high-plains_2.png new file mode 100644 index 00000000000..926dc69c720 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-high-plains_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-high-plains_3.png b/public/images/pokemon/variant/icons/6/666-high-plains_3.png new file mode 100644 index 00000000000..9d4b334bf1d Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-high-plains_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-icy-snow_2.png b/public/images/pokemon/variant/icons/6/666-icy-snow_2.png new file mode 100644 index 00000000000..4afb3068279 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-icy-snow_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-icy-snow_3.png b/public/images/pokemon/variant/icons/6/666-icy-snow_3.png new file mode 100644 index 00000000000..20a0297bb09 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-icy-snow_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-jungle_2.png b/public/images/pokemon/variant/icons/6/666-jungle_2.png new file mode 100644 index 00000000000..85fbd76eaae Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-jungle_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-jungle_3.png b/public/images/pokemon/variant/icons/6/666-jungle_3.png new file mode 100644 index 00000000000..27f202c3f89 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-jungle_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-marine_2.png b/public/images/pokemon/variant/icons/6/666-marine_2.png new file mode 100644 index 00000000000..fecac5f1a56 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-marine_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-marine_3.png b/public/images/pokemon/variant/icons/6/666-marine_3.png new file mode 100644 index 00000000000..a6e6c678373 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-marine_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-meadow_2.png b/public/images/pokemon/variant/icons/6/666-meadow_2.png new file mode 100644 index 00000000000..d9708f5335b Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-meadow_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-meadow_3.png b/public/images/pokemon/variant/icons/6/666-meadow_3.png new file mode 100644 index 00000000000..468668c3706 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-meadow_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-modern_2.png b/public/images/pokemon/variant/icons/6/666-modern_2.png new file mode 100644 index 00000000000..85fa6dcdb17 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-modern_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-modern_3.png b/public/images/pokemon/variant/icons/6/666-modern_3.png new file mode 100644 index 00000000000..d925d62bf44 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-modern_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-monsoon_2.png b/public/images/pokemon/variant/icons/6/666-monsoon_2.png new file mode 100644 index 00000000000..7ea69bd1c91 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-monsoon_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-monsoon_3.png b/public/images/pokemon/variant/icons/6/666-monsoon_3.png new file mode 100644 index 00000000000..718572db21f Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-monsoon_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-ocean_2.png b/public/images/pokemon/variant/icons/6/666-ocean_2.png new file mode 100644 index 00000000000..cdb012595a2 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-ocean_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-ocean_3.png b/public/images/pokemon/variant/icons/6/666-ocean_3.png new file mode 100644 index 00000000000..eb2e996bfbb Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-ocean_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-poke-ball_2.png b/public/images/pokemon/variant/icons/6/666-poke-ball_2.png new file mode 100644 index 00000000000..2aacc409f13 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-poke-ball_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-poke-ball_3.png b/public/images/pokemon/variant/icons/6/666-poke-ball_3.png new file mode 100644 index 00000000000..a41e6253560 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-poke-ball_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-polar_2.png b/public/images/pokemon/variant/icons/6/666-polar_2.png new file mode 100644 index 00000000000..2f69fdf66ab Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-polar_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-polar_3.png b/public/images/pokemon/variant/icons/6/666-polar_3.png new file mode 100644 index 00000000000..6a8bf6098fa Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-polar_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-river_2.png b/public/images/pokemon/variant/icons/6/666-river_2.png new file mode 100644 index 00000000000..66a892a9440 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-river_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-river_3.png b/public/images/pokemon/variant/icons/6/666-river_3.png new file mode 100644 index 00000000000..245d0b0423b Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-river_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-sandstorm_2.png b/public/images/pokemon/variant/icons/6/666-sandstorm_2.png new file mode 100644 index 00000000000..5376a7f4f6f Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-sandstorm_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-sandstorm_3.png b/public/images/pokemon/variant/icons/6/666-sandstorm_3.png new file mode 100644 index 00000000000..a2249c34fa2 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-sandstorm_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-savanna_2.png b/public/images/pokemon/variant/icons/6/666-savanna_2.png new file mode 100644 index 00000000000..a7e9fedf674 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-savanna_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-savanna_3.png b/public/images/pokemon/variant/icons/6/666-savanna_3.png new file mode 100644 index 00000000000..981b8155798 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-savanna_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-sun_2.png b/public/images/pokemon/variant/icons/6/666-sun_2.png new file mode 100644 index 00000000000..67505c4df98 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-sun_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-sun_3.png b/public/images/pokemon/variant/icons/6/666-sun_3.png new file mode 100644 index 00000000000..393a37c8773 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-sun_3.png differ diff --git a/public/images/pokemon/variant/icons/6/666-tundra_2.png b/public/images/pokemon/variant/icons/6/666-tundra_2.png new file mode 100644 index 00000000000..489013d6748 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-tundra_2.png differ diff --git a/public/images/pokemon/variant/icons/6/666-tundra_3.png b/public/images/pokemon/variant/icons/6/666-tundra_3.png new file mode 100644 index 00000000000..4127fd68b79 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/666-tundra_3.png differ diff --git a/public/images/pokemon/variant/icons/6/690_2.png b/public/images/pokemon/variant/icons/6/690_2.png new file mode 100644 index 00000000000..d26f19ffeae Binary files /dev/null and b/public/images/pokemon/variant/icons/6/690_2.png differ diff --git a/public/images/pokemon/variant/icons/6/690_3.png b/public/images/pokemon/variant/icons/6/690_3.png new file mode 100644 index 00000000000..44f1dc8b129 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/690_3.png differ diff --git a/public/images/pokemon/variant/icons/6/691_2.png b/public/images/pokemon/variant/icons/6/691_2.png new file mode 100644 index 00000000000..0e941c2ec90 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/691_2.png differ diff --git a/public/images/pokemon/variant/icons/6/691_3.png b/public/images/pokemon/variant/icons/6/691_3.png new file mode 100644 index 00000000000..6c1f254636e Binary files /dev/null and b/public/images/pokemon/variant/icons/6/691_3.png differ diff --git a/public/images/pokemon/variant/icons/6/696_2.png b/public/images/pokemon/variant/icons/6/696_2.png new file mode 100644 index 00000000000..439efdde52a Binary files /dev/null and b/public/images/pokemon/variant/icons/6/696_2.png differ diff --git a/public/images/pokemon/variant/icons/6/696_3.png b/public/images/pokemon/variant/icons/6/696_3.png new file mode 100644 index 00000000000..e2721bd69ac Binary files /dev/null and b/public/images/pokemon/variant/icons/6/696_3.png differ diff --git a/public/images/pokemon/variant/icons/6/697_2.png b/public/images/pokemon/variant/icons/6/697_2.png new file mode 100644 index 00000000000..eee0fbc8415 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/697_2.png differ diff --git a/public/images/pokemon/variant/icons/6/697_3.png b/public/images/pokemon/variant/icons/6/697_3.png new file mode 100644 index 00000000000..02b61bc05c6 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/697_3.png differ diff --git a/public/images/pokemon/variant/icons/6/700_2.png b/public/images/pokemon/variant/icons/6/700_2.png new file mode 100644 index 00000000000..718027f0552 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/700_2.png differ diff --git a/public/images/pokemon/variant/icons/6/700_3.png b/public/images/pokemon/variant/icons/6/700_3.png new file mode 100644 index 00000000000..7a20bb24146 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/700_3.png differ diff --git a/public/images/pokemon/variant/icons/6/704_2.png b/public/images/pokemon/variant/icons/6/704_2.png new file mode 100644 index 00000000000..b5ef3292868 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/704_2.png differ diff --git a/public/images/pokemon/variant/icons/6/704_3.png b/public/images/pokemon/variant/icons/6/704_3.png new file mode 100644 index 00000000000..362180b54a1 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/704_3.png differ diff --git a/public/images/pokemon/variant/icons/6/705_2.png b/public/images/pokemon/variant/icons/6/705_2.png new file mode 100644 index 00000000000..de2fd606d6b Binary files /dev/null and b/public/images/pokemon/variant/icons/6/705_2.png differ diff --git a/public/images/pokemon/variant/icons/6/705_3.png b/public/images/pokemon/variant/icons/6/705_3.png new file mode 100644 index 00000000000..f79760bc5b4 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/705_3.png differ diff --git a/public/images/pokemon/variant/icons/6/706_2.png b/public/images/pokemon/variant/icons/6/706_2.png new file mode 100644 index 00000000000..01999cbdd86 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/706_2.png differ diff --git a/public/images/pokemon/variant/icons/6/706_3.png b/public/images/pokemon/variant/icons/6/706_3.png new file mode 100644 index 00000000000..03c46970756 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/706_3.png differ diff --git a/public/images/pokemon/variant/icons/6/708_2.png b/public/images/pokemon/variant/icons/6/708_2.png new file mode 100644 index 00000000000..903a00f6164 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/708_2.png differ diff --git a/public/images/pokemon/variant/icons/6/708_3.png b/public/images/pokemon/variant/icons/6/708_3.png new file mode 100644 index 00000000000..0180fca8779 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/708_3.png differ diff --git a/public/images/pokemon/variant/icons/6/709_2.png b/public/images/pokemon/variant/icons/6/709_2.png new file mode 100644 index 00000000000..72eb02bb04e Binary files /dev/null and b/public/images/pokemon/variant/icons/6/709_2.png differ diff --git a/public/images/pokemon/variant/icons/6/709_3.png b/public/images/pokemon/variant/icons/6/709_3.png new file mode 100644 index 00000000000..c53edfa6c9f Binary files /dev/null and b/public/images/pokemon/variant/icons/6/709_3.png differ diff --git a/public/images/pokemon/variant/icons/6/710_2.png b/public/images/pokemon/variant/icons/6/710_2.png new file mode 100644 index 00000000000..91d5b29d1ea Binary files /dev/null and b/public/images/pokemon/variant/icons/6/710_2.png differ diff --git a/public/images/pokemon/variant/icons/6/710_3.png b/public/images/pokemon/variant/icons/6/710_3.png new file mode 100644 index 00000000000..02e4ca50199 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/710_3.png differ diff --git a/public/images/pokemon/variant/icons/6/711_1.png b/public/images/pokemon/variant/icons/6/711_1.png new file mode 100644 index 00000000000..b2360c10df2 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/711_1.png differ diff --git a/public/images/pokemon/variant/icons/6/711_2.png b/public/images/pokemon/variant/icons/6/711_2.png new file mode 100644 index 00000000000..eb85beda5e8 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/711_2.png differ diff --git a/public/images/pokemon/variant/icons/6/711_3.png b/public/images/pokemon/variant/icons/6/711_3.png new file mode 100644 index 00000000000..6e37d2ebff4 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/711_3.png differ diff --git a/public/images/pokemon/variant/icons/6/716-active_2.png b/public/images/pokemon/variant/icons/6/716-active_2.png new file mode 100644 index 00000000000..320407e81f3 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/716-active_2.png differ diff --git a/public/images/pokemon/variant/icons/6/716-active_3.png b/public/images/pokemon/variant/icons/6/716-active_3.png new file mode 100644 index 00000000000..cb575c30f67 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/716-active_3.png differ diff --git a/public/images/pokemon/variant/icons/6/716-neutral_2.png b/public/images/pokemon/variant/icons/6/716-neutral_2.png new file mode 100644 index 00000000000..51e4e640542 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/716-neutral_2.png differ diff --git a/public/images/pokemon/variant/icons/6/716-neutral_3.png b/public/images/pokemon/variant/icons/6/716-neutral_3.png new file mode 100644 index 00000000000..581686f3b06 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/716-neutral_3.png differ diff --git a/public/images/pokemon/variant/icons/6/717_2.png b/public/images/pokemon/variant/icons/6/717_2.png new file mode 100644 index 00000000000..e99a4311980 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/717_2.png differ diff --git a/public/images/pokemon/variant/icons/6/717_3.png b/public/images/pokemon/variant/icons/6/717_3.png new file mode 100644 index 00000000000..8ca50df40e4 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/717_3.png differ diff --git a/public/images/pokemon/variant/icons/6/720-unbound_1.png b/public/images/pokemon/variant/icons/6/720-unbound_1.png new file mode 100644 index 00000000000..e0f5e5f9e32 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/720-unbound_1.png differ diff --git a/public/images/pokemon/variant/icons/6/720-unbound_2.png b/public/images/pokemon/variant/icons/6/720-unbound_2.png new file mode 100644 index 00000000000..2ff7b5f8d92 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/720-unbound_2.png differ diff --git a/public/images/pokemon/variant/icons/6/720-unbound_3.png b/public/images/pokemon/variant/icons/6/720-unbound_3.png new file mode 100644 index 00000000000..29aa89b77e5 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/720-unbound_3.png differ diff --git a/public/images/pokemon/variant/icons/6/720_1.png b/public/images/pokemon/variant/icons/6/720_1.png new file mode 100644 index 00000000000..8a7f03ed222 Binary files /dev/null and b/public/images/pokemon/variant/icons/6/720_1.png differ diff --git a/public/images/pokemon/variant/icons/6/720_2.png b/public/images/pokemon/variant/icons/6/720_2.png new file mode 100644 index 00000000000..632ccf7e3ab Binary files /dev/null and b/public/images/pokemon/variant/icons/6/720_2.png differ diff --git a/public/images/pokemon/variant/icons/6/720_3.png b/public/images/pokemon/variant/icons/6/720_3.png new file mode 100644 index 00000000000..7d0ea61305c Binary files /dev/null and b/public/images/pokemon/variant/icons/6/720_3.png differ diff --git a/public/images/pokemon/variant/icons/7/728_2.png b/public/images/pokemon/variant/icons/7/728_2.png new file mode 100644 index 00000000000..3aa87703a1e Binary files /dev/null and b/public/images/pokemon/variant/icons/7/728_2.png differ diff --git a/public/images/pokemon/variant/icons/7/728_3.png b/public/images/pokemon/variant/icons/7/728_3.png new file mode 100644 index 00000000000..39cf53f1da2 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/728_3.png differ diff --git a/public/images/pokemon/variant/icons/7/729_2.png b/public/images/pokemon/variant/icons/7/729_2.png new file mode 100644 index 00000000000..68a793b7ac2 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/729_2.png differ diff --git a/public/images/pokemon/variant/icons/7/729_3.png b/public/images/pokemon/variant/icons/7/729_3.png new file mode 100644 index 00000000000..17acbd2783c Binary files /dev/null and b/public/images/pokemon/variant/icons/7/729_3.png differ diff --git a/public/images/pokemon/variant/icons/7/730_2.png b/public/images/pokemon/variant/icons/7/730_2.png new file mode 100644 index 00000000000..2b8dd843c54 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/730_2.png differ diff --git a/public/images/pokemon/variant/icons/7/730_3.png b/public/images/pokemon/variant/icons/7/730_3.png new file mode 100644 index 00000000000..0703d8cfd27 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/730_3.png differ diff --git a/public/images/pokemon/variant/icons/7/747_2.png b/public/images/pokemon/variant/icons/7/747_2.png new file mode 100644 index 00000000000..618e2d03694 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/747_2.png differ diff --git a/public/images/pokemon/variant/icons/7/747_3.png b/public/images/pokemon/variant/icons/7/747_3.png new file mode 100644 index 00000000000..df4ecf7373a Binary files /dev/null and b/public/images/pokemon/variant/icons/7/747_3.png differ diff --git a/public/images/pokemon/variant/icons/7/748_2.png b/public/images/pokemon/variant/icons/7/748_2.png new file mode 100644 index 00000000000..7dd1f40bebf Binary files /dev/null and b/public/images/pokemon/variant/icons/7/748_2.png differ diff --git a/public/images/pokemon/variant/icons/7/748_3.png b/public/images/pokemon/variant/icons/7/748_3.png new file mode 100644 index 00000000000..9432853a337 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/748_3.png differ diff --git a/public/images/pokemon/variant/icons/7/753_2.png b/public/images/pokemon/variant/icons/7/753_2.png new file mode 100644 index 00000000000..9f4eabc99e3 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/753_2.png differ diff --git a/public/images/pokemon/variant/icons/7/753_3.png b/public/images/pokemon/variant/icons/7/753_3.png new file mode 100644 index 00000000000..3b09bf63b27 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/753_3.png differ diff --git a/public/images/pokemon/variant/icons/7/754_2.png b/public/images/pokemon/variant/icons/7/754_2.png new file mode 100644 index 00000000000..492a51cbdfb Binary files /dev/null and b/public/images/pokemon/variant/icons/7/754_2.png differ diff --git a/public/images/pokemon/variant/icons/7/754_3.png b/public/images/pokemon/variant/icons/7/754_3.png new file mode 100644 index 00000000000..9c0fcb6b233 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/754_3.png differ diff --git a/public/images/pokemon/variant/icons/7/755_2.png b/public/images/pokemon/variant/icons/7/755_2.png new file mode 100644 index 00000000000..0467be6c530 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/755_2.png differ diff --git a/public/images/pokemon/variant/icons/7/755_3.png b/public/images/pokemon/variant/icons/7/755_3.png new file mode 100644 index 00000000000..0226bc43ba8 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/755_3.png differ diff --git a/public/images/pokemon/variant/icons/7/756_2.png b/public/images/pokemon/variant/icons/7/756_2.png new file mode 100644 index 00000000000..15c497acd2d Binary files /dev/null and b/public/images/pokemon/variant/icons/7/756_2.png differ diff --git a/public/images/pokemon/variant/icons/7/756_3.png b/public/images/pokemon/variant/icons/7/756_3.png new file mode 100644 index 00000000000..b93ddee49fa Binary files /dev/null and b/public/images/pokemon/variant/icons/7/756_3.png differ diff --git a/public/images/pokemon/variant/icons/7/761_2.png b/public/images/pokemon/variant/icons/7/761_2.png new file mode 100644 index 00000000000..a8257923663 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/761_2.png differ diff --git a/public/images/pokemon/variant/icons/7/761_3.png b/public/images/pokemon/variant/icons/7/761_3.png new file mode 100644 index 00000000000..46325a4f41e Binary files /dev/null and b/public/images/pokemon/variant/icons/7/761_3.png differ diff --git a/public/images/pokemon/variant/icons/7/762_2.png b/public/images/pokemon/variant/icons/7/762_2.png new file mode 100644 index 00000000000..98c42901971 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/762_2.png differ diff --git a/public/images/pokemon/variant/icons/7/762_3.png b/public/images/pokemon/variant/icons/7/762_3.png new file mode 100644 index 00000000000..d26d5b370f5 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/762_3.png differ diff --git a/public/images/pokemon/variant/icons/7/763_2.png b/public/images/pokemon/variant/icons/7/763_2.png new file mode 100644 index 00000000000..49480fea9af Binary files /dev/null and b/public/images/pokemon/variant/icons/7/763_2.png differ diff --git a/public/images/pokemon/variant/icons/7/763_3.png b/public/images/pokemon/variant/icons/7/763_3.png new file mode 100644 index 00000000000..5a3ef24fd7b Binary files /dev/null and b/public/images/pokemon/variant/icons/7/763_3.png differ diff --git a/public/images/pokemon/variant/icons/7/767_2.png b/public/images/pokemon/variant/icons/7/767_2.png new file mode 100644 index 00000000000..f15b6e875a1 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/767_2.png differ diff --git a/public/images/pokemon/variant/icons/7/767_3.png b/public/images/pokemon/variant/icons/7/767_3.png new file mode 100644 index 00000000000..561e0e050f8 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/767_3.png differ diff --git a/public/images/pokemon/variant/icons/7/768_2.png b/public/images/pokemon/variant/icons/7/768_2.png new file mode 100644 index 00000000000..93f53413739 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/768_2.png differ diff --git a/public/images/pokemon/variant/icons/7/768_3.png b/public/images/pokemon/variant/icons/7/768_3.png new file mode 100644 index 00000000000..0d60869a64e Binary files /dev/null and b/public/images/pokemon/variant/icons/7/768_3.png differ diff --git a/public/images/pokemon/variant/icons/7/789_1.png b/public/images/pokemon/variant/icons/7/789_1.png new file mode 100644 index 00000000000..fe970efa3d4 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/789_1.png differ diff --git a/public/images/pokemon/variant/icons/7/789_2.png b/public/images/pokemon/variant/icons/7/789_2.png new file mode 100644 index 00000000000..40723d16b01 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/789_2.png differ diff --git a/public/images/pokemon/variant/icons/7/789_3.png b/public/images/pokemon/variant/icons/7/789_3.png new file mode 100644 index 00000000000..b7010acfb66 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/789_3.png differ diff --git a/public/images/pokemon/variant/icons/7/790_2.png b/public/images/pokemon/variant/icons/7/790_2.png new file mode 100644 index 00000000000..c0ba96c45c2 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/790_2.png differ diff --git a/public/images/pokemon/variant/icons/7/790_3.png b/public/images/pokemon/variant/icons/7/790_3.png new file mode 100644 index 00000000000..c46edca22e3 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/790_3.png differ diff --git a/public/images/pokemon/variant/icons/7/791_1.png b/public/images/pokemon/variant/icons/7/791_1.png new file mode 100644 index 00000000000..dfba58f0364 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/791_1.png differ diff --git a/public/images/pokemon/variant/icons/7/791_2.png b/public/images/pokemon/variant/icons/7/791_2.png new file mode 100644 index 00000000000..98ebb49dad4 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/791_2.png differ diff --git a/public/images/pokemon/variant/icons/7/791_3.png b/public/images/pokemon/variant/icons/7/791_3.png new file mode 100644 index 00000000000..6df5930b0ef Binary files /dev/null and b/public/images/pokemon/variant/icons/7/791_3.png differ diff --git a/public/images/pokemon/variant/icons/7/792_2.png b/public/images/pokemon/variant/icons/7/792_2.png new file mode 100644 index 00000000000..21c69bac01f Binary files /dev/null and b/public/images/pokemon/variant/icons/7/792_2.png differ diff --git a/public/images/pokemon/variant/icons/7/792_3.png b/public/images/pokemon/variant/icons/7/792_3.png new file mode 100644 index 00000000000..81e59050764 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/792_3.png differ diff --git a/public/images/pokemon/variant/icons/7/793_2.png b/public/images/pokemon/variant/icons/7/793_2.png new file mode 100644 index 00000000000..c4c8977c807 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/793_2.png differ diff --git a/public/images/pokemon/variant/icons/7/793_3.png b/public/images/pokemon/variant/icons/7/793_3.png new file mode 100644 index 00000000000..f64877f3e52 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/793_3.png differ diff --git a/public/images/pokemon/variant/icons/7/800-dawn-wings_2.png b/public/images/pokemon/variant/icons/7/800-dawn-wings_2.png new file mode 100644 index 00000000000..b0c4d306f03 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800-dawn-wings_2.png differ diff --git a/public/images/pokemon/variant/icons/7/800-dawn-wings_3.png b/public/images/pokemon/variant/icons/7/800-dawn-wings_3.png new file mode 100644 index 00000000000..bef8e4ee52e Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800-dawn-wings_3.png differ diff --git a/public/images/pokemon/variant/icons/7/800-dusk-mane_2.png b/public/images/pokemon/variant/icons/7/800-dusk-mane_2.png new file mode 100644 index 00000000000..571cf4736e3 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800-dusk-mane_2.png differ diff --git a/public/images/pokemon/variant/icons/7/800-dusk-mane_3.png b/public/images/pokemon/variant/icons/7/800-dusk-mane_3.png new file mode 100644 index 00000000000..96c309e8b15 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800-dusk-mane_3.png differ diff --git a/public/images/pokemon/variant/icons/7/800-ultra_2.png b/public/images/pokemon/variant/icons/7/800-ultra_2.png new file mode 100644 index 00000000000..75ee17fa2f3 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800-ultra_2.png differ diff --git a/public/images/pokemon/variant/icons/7/800-ultra_3.png b/public/images/pokemon/variant/icons/7/800-ultra_3.png new file mode 100644 index 00000000000..d4d35bbfb9d Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800-ultra_3.png differ diff --git a/public/images/pokemon/variant/icons/7/800_2.png b/public/images/pokemon/variant/icons/7/800_2.png new file mode 100644 index 00000000000..b107563964f Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800_2.png differ diff --git a/public/images/pokemon/variant/icons/7/800_3.png b/public/images/pokemon/variant/icons/7/800_3.png new file mode 100644 index 00000000000..a726b890756 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/800_3.png differ diff --git a/public/images/pokemon/variant/icons/7/802_1.png b/public/images/pokemon/variant/icons/7/802_1.png new file mode 100644 index 00000000000..d9e268dd2e7 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/802_1.png differ diff --git a/public/images/pokemon/variant/icons/7/802_2.png b/public/images/pokemon/variant/icons/7/802_2.png new file mode 100644 index 00000000000..039dbd12e03 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/802_2.png differ diff --git a/public/images/pokemon/variant/icons/7/802_3.png b/public/images/pokemon/variant/icons/7/802_3.png new file mode 100644 index 00000000000..e371bd9e6bc Binary files /dev/null and b/public/images/pokemon/variant/icons/7/802_3.png differ diff --git a/public/images/pokemon/variant/icons/7/808_2.png b/public/images/pokemon/variant/icons/7/808_2.png new file mode 100644 index 00000000000..fa2bae22836 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/808_2.png differ diff --git a/public/images/pokemon/variant/icons/7/808_3.png b/public/images/pokemon/variant/icons/7/808_3.png new file mode 100644 index 00000000000..49dec761bf4 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/808_3.png differ diff --git a/public/images/pokemon/variant/icons/7/809-gigantamax_2.png b/public/images/pokemon/variant/icons/7/809-gigantamax_2.png new file mode 100644 index 00000000000..00b22ee0bea Binary files /dev/null and b/public/images/pokemon/variant/icons/7/809-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/7/809-gigantamax_3.png b/public/images/pokemon/variant/icons/7/809-gigantamax_3.png new file mode 100644 index 00000000000..36897253693 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/809-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/7/809_2.png b/public/images/pokemon/variant/icons/7/809_2.png new file mode 100644 index 00000000000..c10f36cc8a2 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/809_2.png differ diff --git a/public/images/pokemon/variant/icons/7/809_3.png b/public/images/pokemon/variant/icons/7/809_3.png new file mode 100644 index 00000000000..813379e46c1 Binary files /dev/null and b/public/images/pokemon/variant/icons/7/809_3.png differ diff --git a/public/images/pokemon/variant/icons/8/4052_2.png b/public/images/pokemon/variant/icons/8/4052_2.png new file mode 100644 index 00000000000..0d71d69fa06 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/4052_2.png differ diff --git a/public/images/pokemon/variant/icons/8/4052_3.png b/public/images/pokemon/variant/icons/8/4052_3.png new file mode 100644 index 00000000000..14038420fc3 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/4052_3.png differ diff --git a/public/images/pokemon/variant/icons/8/4263_2.png b/public/images/pokemon/variant/icons/8/4263_2.png new file mode 100644 index 00000000000..abf0690d946 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/4263_2.png differ diff --git a/public/images/pokemon/variant/icons/8/4263_3.png b/public/images/pokemon/variant/icons/8/4263_3.png new file mode 100644 index 00000000000..eb41f1d6edf Binary files /dev/null and b/public/images/pokemon/variant/icons/8/4263_3.png differ diff --git a/public/images/pokemon/variant/icons/8/4264_2.png b/public/images/pokemon/variant/icons/8/4264_2.png new file mode 100644 index 00000000000..a176b19139b Binary files /dev/null and b/public/images/pokemon/variant/icons/8/4264_2.png differ diff --git a/public/images/pokemon/variant/icons/8/4264_3.png b/public/images/pokemon/variant/icons/8/4264_3.png new file mode 100644 index 00000000000..80ff6ee4314 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/4264_3.png differ diff --git a/public/images/pokemon/variant/icons/8/6215_2.png b/public/images/pokemon/variant/icons/8/6215_2.png new file mode 100644 index 00000000000..fcc3a2c0bec Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6215_2.png differ diff --git a/public/images/pokemon/variant/icons/8/6215_3.png b/public/images/pokemon/variant/icons/8/6215_3.png new file mode 100644 index 00000000000..5f01d7ac0dd Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6215_3.png differ diff --git a/public/images/pokemon/variant/icons/8/6549_2.png b/public/images/pokemon/variant/icons/8/6549_2.png new file mode 100644 index 00000000000..89846aeb4c3 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6549_2.png differ diff --git a/public/images/pokemon/variant/icons/8/6549_3.png b/public/images/pokemon/variant/icons/8/6549_3.png new file mode 100644 index 00000000000..017b78430d6 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6549_3.png differ diff --git a/public/images/pokemon/variant/icons/8/6570_2.png b/public/images/pokemon/variant/icons/8/6570_2.png new file mode 100644 index 00000000000..c1309423a17 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6570_2.png differ diff --git a/public/images/pokemon/variant/icons/8/6570_3.png b/public/images/pokemon/variant/icons/8/6570_3.png new file mode 100644 index 00000000000..d01a08b1745 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6570_3.png differ diff --git a/public/images/pokemon/variant/icons/8/6571_2.png b/public/images/pokemon/variant/icons/8/6571_2.png new file mode 100644 index 00000000000..2da0932716b Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6571_2.png differ diff --git a/public/images/pokemon/variant/icons/8/6571_3.png b/public/images/pokemon/variant/icons/8/6571_3.png new file mode 100644 index 00000000000..e1587335c74 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6571_3.png differ diff --git a/public/images/pokemon/variant/icons/8/6705_2.png b/public/images/pokemon/variant/icons/8/6705_2.png new file mode 100644 index 00000000000..2f4a0b3f939 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6705_2.png differ diff --git a/public/images/pokemon/variant/icons/8/6705_3.png b/public/images/pokemon/variant/icons/8/6705_3.png new file mode 100644 index 00000000000..47798e1e9c6 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6705_3.png differ diff --git a/public/images/pokemon/variant/icons/8/6706_2.png b/public/images/pokemon/variant/icons/8/6706_2.png new file mode 100644 index 00000000000..8f2423ebd7c Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6706_2.png differ diff --git a/public/images/pokemon/variant/icons/8/6706_3.png b/public/images/pokemon/variant/icons/8/6706_3.png new file mode 100644 index 00000000000..7f265f02f4c Binary files /dev/null and b/public/images/pokemon/variant/icons/8/6706_3.png differ diff --git a/public/images/pokemon/variant/icons/8/821_2.png b/public/images/pokemon/variant/icons/8/821_2.png new file mode 100644 index 00000000000..5b449e5feba Binary files /dev/null and b/public/images/pokemon/variant/icons/8/821_2.png differ diff --git a/public/images/pokemon/variant/icons/8/821_3.png b/public/images/pokemon/variant/icons/8/821_3.png new file mode 100644 index 00000000000..eeed384b92f Binary files /dev/null and b/public/images/pokemon/variant/icons/8/821_3.png differ diff --git a/public/images/pokemon/variant/icons/8/822_2.png b/public/images/pokemon/variant/icons/8/822_2.png new file mode 100644 index 00000000000..f632cf31a47 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/822_2.png differ diff --git a/public/images/pokemon/variant/icons/8/822_3.png b/public/images/pokemon/variant/icons/8/822_3.png new file mode 100644 index 00000000000..306efdb7140 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/822_3.png differ diff --git a/public/images/pokemon/variant/icons/8/823-gigantamax_2.png b/public/images/pokemon/variant/icons/8/823-gigantamax_2.png new file mode 100644 index 00000000000..5d0a40e8cae Binary files /dev/null and b/public/images/pokemon/variant/icons/8/823-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/8/823-gigantamax_3.png b/public/images/pokemon/variant/icons/8/823-gigantamax_3.png new file mode 100644 index 00000000000..c249206b3e8 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/823-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/8/823_2.png b/public/images/pokemon/variant/icons/8/823_2.png new file mode 100644 index 00000000000..dfd5d3dbf0d Binary files /dev/null and b/public/images/pokemon/variant/icons/8/823_2.png differ diff --git a/public/images/pokemon/variant/icons/8/823_3.png b/public/images/pokemon/variant/icons/8/823_3.png new file mode 100644 index 00000000000..881c79314a7 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/823_3.png differ diff --git a/public/images/pokemon/variant/icons/8/829_2.png b/public/images/pokemon/variant/icons/8/829_2.png new file mode 100644 index 00000000000..350d90c1269 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/829_2.png differ diff --git a/public/images/pokemon/variant/icons/8/829_3.png b/public/images/pokemon/variant/icons/8/829_3.png new file mode 100644 index 00000000000..5fcba4d0bc9 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/829_3.png differ diff --git a/public/images/pokemon/variant/icons/8/830_2.png b/public/images/pokemon/variant/icons/8/830_2.png new file mode 100644 index 00000000000..dad419af7f3 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/830_2.png differ diff --git a/public/images/pokemon/variant/icons/8/830_3.png b/public/images/pokemon/variant/icons/8/830_3.png new file mode 100644 index 00000000000..a50fbb04f8f Binary files /dev/null and b/public/images/pokemon/variant/icons/8/830_3.png differ diff --git a/public/images/pokemon/variant/icons/8/835_2.png b/public/images/pokemon/variant/icons/8/835_2.png new file mode 100644 index 00000000000..73840f23af5 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/835_2.png differ diff --git a/public/images/pokemon/variant/icons/8/835_3.png b/public/images/pokemon/variant/icons/8/835_3.png new file mode 100644 index 00000000000..46eca8da04a Binary files /dev/null and b/public/images/pokemon/variant/icons/8/835_3.png differ diff --git a/public/images/pokemon/variant/icons/8/836_2.png b/public/images/pokemon/variant/icons/8/836_2.png new file mode 100644 index 00000000000..d85c4066966 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/836_2.png differ diff --git a/public/images/pokemon/variant/icons/8/836_3.png b/public/images/pokemon/variant/icons/8/836_3.png new file mode 100644 index 00000000000..2c3dc0e4146 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/836_3.png differ diff --git a/public/images/pokemon/variant/icons/8/851-gigantamax_2.png b/public/images/pokemon/variant/icons/8/851-gigantamax_2.png new file mode 100644 index 00000000000..33e2386319a Binary files /dev/null and b/public/images/pokemon/variant/icons/8/851-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/8/851-gigantamax_3.png b/public/images/pokemon/variant/icons/8/851-gigantamax_3.png new file mode 100644 index 00000000000..a444420e17f Binary files /dev/null and b/public/images/pokemon/variant/icons/8/851-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/8/856_2.png b/public/images/pokemon/variant/icons/8/856_2.png new file mode 100644 index 00000000000..6474bf08629 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/856_2.png differ diff --git a/public/images/pokemon/variant/icons/8/856_3.png b/public/images/pokemon/variant/icons/8/856_3.png new file mode 100644 index 00000000000..c5898aa47e0 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/856_3.png differ diff --git a/public/images/pokemon/variant/icons/8/857_2.png b/public/images/pokemon/variant/icons/8/857_2.png new file mode 100644 index 00000000000..b1a4c2f82ba Binary files /dev/null and b/public/images/pokemon/variant/icons/8/857_2.png differ diff --git a/public/images/pokemon/variant/icons/8/857_3.png b/public/images/pokemon/variant/icons/8/857_3.png new file mode 100644 index 00000000000..d04b631f628 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/857_3.png differ diff --git a/public/images/pokemon/variant/icons/8/858-gigantamax_2.png b/public/images/pokemon/variant/icons/8/858-gigantamax_2.png new file mode 100644 index 00000000000..8318e810b9b Binary files /dev/null and b/public/images/pokemon/variant/icons/8/858-gigantamax_2.png differ diff --git a/public/images/pokemon/variant/icons/8/858-gigantamax_3.png b/public/images/pokemon/variant/icons/8/858-gigantamax_3.png new file mode 100644 index 00000000000..30a463a679a Binary files /dev/null and b/public/images/pokemon/variant/icons/8/858-gigantamax_3.png differ diff --git a/public/images/pokemon/variant/icons/8/858_2.png b/public/images/pokemon/variant/icons/8/858_2.png new file mode 100644 index 00000000000..c129c2df02d Binary files /dev/null and b/public/images/pokemon/variant/icons/8/858_2.png differ diff --git a/public/images/pokemon/variant/icons/8/858_3.png b/public/images/pokemon/variant/icons/8/858_3.png new file mode 100644 index 00000000000..499312644de Binary files /dev/null and b/public/images/pokemon/variant/icons/8/858_3.png differ diff --git a/public/images/pokemon/variant/icons/8/862_2.png b/public/images/pokemon/variant/icons/8/862_2.png new file mode 100644 index 00000000000..87a3d78d462 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/862_2.png differ diff --git a/public/images/pokemon/variant/icons/8/862_3.png b/public/images/pokemon/variant/icons/8/862_3.png new file mode 100644 index 00000000000..81702e80b6e Binary files /dev/null and b/public/images/pokemon/variant/icons/8/862_3.png differ diff --git a/public/images/pokemon/variant/icons/8/863_2.png b/public/images/pokemon/variant/icons/8/863_2.png new file mode 100644 index 00000000000..8fde01a1bf0 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/863_2.png differ diff --git a/public/images/pokemon/variant/icons/8/863_3.png b/public/images/pokemon/variant/icons/8/863_3.png new file mode 100644 index 00000000000..0f5899de0f7 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/863_3.png differ diff --git a/public/images/pokemon/variant/icons/8/872_1.png b/public/images/pokemon/variant/icons/8/872_1.png new file mode 100644 index 00000000000..585412d2397 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/872_1.png differ diff --git a/public/images/pokemon/variant/icons/8/872_2.png b/public/images/pokemon/variant/icons/8/872_2.png new file mode 100644 index 00000000000..258f8fd225b Binary files /dev/null and b/public/images/pokemon/variant/icons/8/872_2.png differ diff --git a/public/images/pokemon/variant/icons/8/872_3.png b/public/images/pokemon/variant/icons/8/872_3.png new file mode 100644 index 00000000000..2dc2a3f88da Binary files /dev/null and b/public/images/pokemon/variant/icons/8/872_3.png differ diff --git a/public/images/pokemon/variant/icons/8/873_1.png b/public/images/pokemon/variant/icons/8/873_1.png new file mode 100644 index 00000000000..e3ca501356b Binary files /dev/null and b/public/images/pokemon/variant/icons/8/873_1.png differ diff --git a/public/images/pokemon/variant/icons/8/873_2.png b/public/images/pokemon/variant/icons/8/873_2.png new file mode 100644 index 00000000000..76a37ec55c8 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/873_2.png differ diff --git a/public/images/pokemon/variant/icons/8/873_3.png b/public/images/pokemon/variant/icons/8/873_3.png new file mode 100644 index 00000000000..8101b0f317e Binary files /dev/null and b/public/images/pokemon/variant/icons/8/873_3.png differ diff --git a/public/images/pokemon/variant/icons/8/877-hangry_1.png b/public/images/pokemon/variant/icons/8/877-hangry_1.png new file mode 100644 index 00000000000..9ccfcba6dcf Binary files /dev/null and b/public/images/pokemon/variant/icons/8/877-hangry_1.png differ diff --git a/public/images/pokemon/variant/icons/8/877-hangry_2.png b/public/images/pokemon/variant/icons/8/877-hangry_2.png new file mode 100644 index 00000000000..03c6e48a63d Binary files /dev/null and b/public/images/pokemon/variant/icons/8/877-hangry_2.png differ diff --git a/public/images/pokemon/variant/icons/8/877-hangry_3.png b/public/images/pokemon/variant/icons/8/877-hangry_3.png new file mode 100644 index 00000000000..5dbf6ca7cdf Binary files /dev/null and b/public/images/pokemon/variant/icons/8/877-hangry_3.png differ diff --git a/public/images/pokemon/variant/icons/8/877_1.png b/public/images/pokemon/variant/icons/8/877_1.png new file mode 100644 index 00000000000..c9cd435fac8 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/877_1.png differ diff --git a/public/images/pokemon/variant/icons/8/877_2.png b/public/images/pokemon/variant/icons/8/877_2.png new file mode 100644 index 00000000000..bfebde92e5e Binary files /dev/null and b/public/images/pokemon/variant/icons/8/877_2.png differ diff --git a/public/images/pokemon/variant/icons/8/877_3.png b/public/images/pokemon/variant/icons/8/877_3.png new file mode 100644 index 00000000000..8fb654de930 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/877_3.png differ diff --git a/public/images/pokemon/variant/icons/8/885_1.png b/public/images/pokemon/variant/icons/8/885_1.png new file mode 100644 index 00000000000..ec0849c4a3a Binary files /dev/null and b/public/images/pokemon/variant/icons/8/885_1.png differ diff --git a/public/images/pokemon/variant/icons/8/885_2.png b/public/images/pokemon/variant/icons/8/885_2.png new file mode 100644 index 00000000000..5b19fac0813 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/885_2.png differ diff --git a/public/images/pokemon/variant/icons/8/885_3.png b/public/images/pokemon/variant/icons/8/885_3.png new file mode 100644 index 00000000000..3938810e1d9 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/885_3.png differ diff --git a/public/images/pokemon/variant/icons/8/886_1.png b/public/images/pokemon/variant/icons/8/886_1.png new file mode 100644 index 00000000000..0001af872dc Binary files /dev/null and b/public/images/pokemon/variant/icons/8/886_1.png differ diff --git a/public/images/pokemon/variant/icons/8/886_2.png b/public/images/pokemon/variant/icons/8/886_2.png new file mode 100644 index 00000000000..b49491cbafd Binary files /dev/null and b/public/images/pokemon/variant/icons/8/886_2.png differ diff --git a/public/images/pokemon/variant/icons/8/886_3.png b/public/images/pokemon/variant/icons/8/886_3.png new file mode 100644 index 00000000000..5de076df77c Binary files /dev/null and b/public/images/pokemon/variant/icons/8/886_3.png differ diff --git a/public/images/pokemon/variant/icons/8/887_1.png b/public/images/pokemon/variant/icons/8/887_1.png new file mode 100644 index 00000000000..6efb0d638d6 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/887_1.png differ diff --git a/public/images/pokemon/variant/icons/8/887_2.png b/public/images/pokemon/variant/icons/8/887_2.png new file mode 100644 index 00000000000..28a337f295b Binary files /dev/null and b/public/images/pokemon/variant/icons/8/887_2.png differ diff --git a/public/images/pokemon/variant/icons/8/887_3.png b/public/images/pokemon/variant/icons/8/887_3.png new file mode 100644 index 00000000000..12507e42247 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/887_3.png differ diff --git a/public/images/pokemon/variant/icons/8/890-eternamax_2.png b/public/images/pokemon/variant/icons/8/890-eternamax_2.png new file mode 100644 index 00000000000..e9168e582cf Binary files /dev/null and b/public/images/pokemon/variant/icons/8/890-eternamax_2.png differ diff --git a/public/images/pokemon/variant/icons/8/890-eternamax_3.png b/public/images/pokemon/variant/icons/8/890-eternamax_3.png new file mode 100644 index 00000000000..885d081c6e0 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/890-eternamax_3.png differ diff --git a/public/images/pokemon/variant/icons/8/890_2.png b/public/images/pokemon/variant/icons/8/890_2.png new file mode 100644 index 00000000000..2afdc3f6fee Binary files /dev/null and b/public/images/pokemon/variant/icons/8/890_2.png differ diff --git a/public/images/pokemon/variant/icons/8/890_3.png b/public/images/pokemon/variant/icons/8/890_3.png new file mode 100644 index 00000000000..dbf49ec615a Binary files /dev/null and b/public/images/pokemon/variant/icons/8/890_3.png differ diff --git a/public/images/pokemon/variant/icons/8/900_2.png b/public/images/pokemon/variant/icons/8/900_2.png new file mode 100644 index 00000000000..376c1dbe794 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/900_2.png differ diff --git a/public/images/pokemon/variant/icons/8/900_3.png b/public/images/pokemon/variant/icons/8/900_3.png new file mode 100644 index 00000000000..9e2fb2a91af Binary files /dev/null and b/public/images/pokemon/variant/icons/8/900_3.png differ diff --git a/public/images/pokemon/variant/icons/8/901_1.png b/public/images/pokemon/variant/icons/8/901_1.png new file mode 100644 index 00000000000..fadff3dce8d Binary files /dev/null and b/public/images/pokemon/variant/icons/8/901_1.png differ diff --git a/public/images/pokemon/variant/icons/8/901_2.png b/public/images/pokemon/variant/icons/8/901_2.png new file mode 100644 index 00000000000..0140889bd6d Binary files /dev/null and b/public/images/pokemon/variant/icons/8/901_2.png differ diff --git a/public/images/pokemon/variant/icons/8/901_3.png b/public/images/pokemon/variant/icons/8/901_3.png new file mode 100644 index 00000000000..7e21a682fa3 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/901_3.png differ diff --git a/public/images/pokemon/variant/icons/8/903_2.png b/public/images/pokemon/variant/icons/8/903_2.png new file mode 100644 index 00000000000..fdcabbe644f Binary files /dev/null and b/public/images/pokemon/variant/icons/8/903_2.png differ diff --git a/public/images/pokemon/variant/icons/8/903_3.png b/public/images/pokemon/variant/icons/8/903_3.png new file mode 100644 index 00000000000..b96cbbd6154 Binary files /dev/null and b/public/images/pokemon/variant/icons/8/903_3.png differ diff --git a/public/images/pokemon/variant/icons/9/1000_1.png b/public/images/pokemon/variant/icons/9/1000_1.png new file mode 100644 index 00000000000..92457719472 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1000_1.png differ diff --git a/public/images/pokemon/variant/icons/9/1000_2.png b/public/images/pokemon/variant/icons/9/1000_2.png new file mode 100644 index 00000000000..def858c1d10 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1000_2.png differ diff --git a/public/images/pokemon/variant/icons/9/1000_3.png b/public/images/pokemon/variant/icons/9/1000_3.png new file mode 100644 index 00000000000..e9ce3de8d62 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1000_3.png differ diff --git a/public/images/pokemon/variant/icons/9/1001_2.png b/public/images/pokemon/variant/icons/9/1001_2.png new file mode 100644 index 00000000000..65398390881 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1001_2.png differ diff --git a/public/images/pokemon/variant/icons/9/1001_3.png b/public/images/pokemon/variant/icons/9/1001_3.png new file mode 100644 index 00000000000..99d29a19c00 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1001_3.png differ diff --git a/public/images/pokemon/variant/icons/9/1004_2.png b/public/images/pokemon/variant/icons/9/1004_2.png new file mode 100644 index 00000000000..1a2761659a6 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1004_2.png differ diff --git a/public/images/pokemon/variant/icons/9/1004_3.png b/public/images/pokemon/variant/icons/9/1004_3.png new file mode 100644 index 00000000000..d42a84ed698 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1004_3.png differ diff --git a/public/images/pokemon/variant/icons/9/1007-apex-build_2.png b/public/images/pokemon/variant/icons/9/1007-apex-build_2.png new file mode 100644 index 00000000000..7b8fd5f6114 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1007-apex-build_2.png differ diff --git a/public/images/pokemon/variant/icons/9/1007-apex-build_3.png b/public/images/pokemon/variant/icons/9/1007-apex-build_3.png new file mode 100644 index 00000000000..ead43d9b1f9 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1007-apex-build_3.png differ diff --git a/public/images/pokemon/variant/icons/9/1008-ultimate-mode_1.png b/public/images/pokemon/variant/icons/9/1008-ultimate-mode_1.png new file mode 100644 index 00000000000..554984faa64 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1008-ultimate-mode_1.png differ diff --git a/public/images/pokemon/variant/icons/9/1008-ultimate-mode_2.png b/public/images/pokemon/variant/icons/9/1008-ultimate-mode_2.png new file mode 100644 index 00000000000..b96ce1bd85b Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1008-ultimate-mode_2.png differ diff --git a/public/images/pokemon/variant/icons/9/1008-ultimate-mode_3.png b/public/images/pokemon/variant/icons/9/1008-ultimate-mode_3.png new file mode 100644 index 00000000000..a3698052aa8 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/1008-ultimate-mode_3.png differ diff --git a/public/images/pokemon/variant/icons/9/8901_1.png b/public/images/pokemon/variant/icons/9/8901_1.png new file mode 100644 index 00000000000..fb0c9c395fb Binary files /dev/null and b/public/images/pokemon/variant/icons/9/8901_1.png differ diff --git a/public/images/pokemon/variant/icons/9/8901_2.png b/public/images/pokemon/variant/icons/9/8901_2.png new file mode 100644 index 00000000000..c95721ee59e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/8901_2.png differ diff --git a/public/images/pokemon/variant/icons/9/8901_3.png b/public/images/pokemon/variant/icons/9/8901_3.png new file mode 100644 index 00000000000..926777a226f Binary files /dev/null and b/public/images/pokemon/variant/icons/9/8901_3.png differ diff --git a/public/images/pokemon/variant/icons/9/909_2.png b/public/images/pokemon/variant/icons/9/909_2.png new file mode 100644 index 00000000000..d5797290e69 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/909_2.png differ diff --git a/public/images/pokemon/variant/icons/9/909_3.png b/public/images/pokemon/variant/icons/9/909_3.png new file mode 100644 index 00000000000..d4d7a9593a4 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/909_3.png differ diff --git a/public/images/pokemon/variant/icons/9/910_2.png b/public/images/pokemon/variant/icons/9/910_2.png new file mode 100644 index 00000000000..9a808d0e3b7 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/910_2.png differ diff --git a/public/images/pokemon/variant/icons/9/910_3.png b/public/images/pokemon/variant/icons/9/910_3.png new file mode 100644 index 00000000000..0521f47961f Binary files /dev/null and b/public/images/pokemon/variant/icons/9/910_3.png differ diff --git a/public/images/pokemon/variant/icons/9/911_2.png b/public/images/pokemon/variant/icons/9/911_2.png new file mode 100644 index 00000000000..cebbbb77c95 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/911_2.png differ diff --git a/public/images/pokemon/variant/icons/9/911_3.png b/public/images/pokemon/variant/icons/9/911_3.png new file mode 100644 index 00000000000..3182c11e2e0 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/911_3.png differ diff --git a/public/images/pokemon/variant/icons/9/919_1.png b/public/images/pokemon/variant/icons/9/919_1.png new file mode 100644 index 00000000000..d6020b717db Binary files /dev/null and b/public/images/pokemon/variant/icons/9/919_1.png differ diff --git a/public/images/pokemon/variant/icons/9/919_2.png b/public/images/pokemon/variant/icons/9/919_2.png new file mode 100644 index 00000000000..0e6cc33f0cb Binary files /dev/null and b/public/images/pokemon/variant/icons/9/919_2.png differ diff --git a/public/images/pokemon/variant/icons/9/919_3.png b/public/images/pokemon/variant/icons/9/919_3.png new file mode 100644 index 00000000000..5480bc5f1f8 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/919_3.png differ diff --git a/public/images/pokemon/variant/icons/9/920_1.png b/public/images/pokemon/variant/icons/9/920_1.png new file mode 100644 index 00000000000..186bebbdc9d Binary files /dev/null and b/public/images/pokemon/variant/icons/9/920_1.png differ diff --git a/public/images/pokemon/variant/icons/9/920_2.png b/public/images/pokemon/variant/icons/9/920_2.png new file mode 100644 index 00000000000..99b1e663dc0 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/920_2.png differ diff --git a/public/images/pokemon/variant/icons/9/920_3.png b/public/images/pokemon/variant/icons/9/920_3.png new file mode 100644 index 00000000000..25bd3d3c629 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/920_3.png differ diff --git a/public/images/pokemon/variant/icons/9/924_1.png b/public/images/pokemon/variant/icons/9/924_1.png new file mode 100644 index 00000000000..fbf980cd5f1 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/924_1.png differ diff --git a/public/images/pokemon/variant/icons/9/924_2.png b/public/images/pokemon/variant/icons/9/924_2.png new file mode 100644 index 00000000000..5432c135b40 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/924_2.png differ diff --git a/public/images/pokemon/variant/icons/9/924_3.png b/public/images/pokemon/variant/icons/9/924_3.png new file mode 100644 index 00000000000..fe438313f67 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/924_3.png differ diff --git a/public/images/pokemon/variant/icons/9/925-four_1.png b/public/images/pokemon/variant/icons/9/925-four_1.png new file mode 100644 index 00000000000..5e5fa3dd186 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/925-four_1.png differ diff --git a/public/images/pokemon/variant/icons/9/925-four_2.png b/public/images/pokemon/variant/icons/9/925-four_2.png new file mode 100644 index 00000000000..9f480930adc Binary files /dev/null and b/public/images/pokemon/variant/icons/9/925-four_2.png differ diff --git a/public/images/pokemon/variant/icons/9/925-four_3.png b/public/images/pokemon/variant/icons/9/925-four_3.png new file mode 100644 index 00000000000..997bb356a0d Binary files /dev/null and b/public/images/pokemon/variant/icons/9/925-four_3.png differ diff --git a/public/images/pokemon/variant/icons/9/925-three_1.png b/public/images/pokemon/variant/icons/9/925-three_1.png new file mode 100644 index 00000000000..486f5c0ec3b Binary files /dev/null and b/public/images/pokemon/variant/icons/9/925-three_1.png differ diff --git a/public/images/pokemon/variant/icons/9/925-three_2.png b/public/images/pokemon/variant/icons/9/925-three_2.png new file mode 100644 index 00000000000..53eaec0f370 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/925-three_2.png differ diff --git a/public/images/pokemon/variant/icons/9/925-three_3.png b/public/images/pokemon/variant/icons/9/925-three_3.png new file mode 100644 index 00000000000..1381738cc7b Binary files /dev/null and b/public/images/pokemon/variant/icons/9/925-three_3.png differ diff --git a/public/images/pokemon/variant/icons/9/935_1.png b/public/images/pokemon/variant/icons/9/935_1.png new file mode 100644 index 00000000000..2b143a45186 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/935_1.png differ diff --git a/public/images/pokemon/variant/icons/9/935_2.png b/public/images/pokemon/variant/icons/9/935_2.png new file mode 100644 index 00000000000..3d6abd8bbba Binary files /dev/null and b/public/images/pokemon/variant/icons/9/935_2.png differ diff --git a/public/images/pokemon/variant/icons/9/935_3.png b/public/images/pokemon/variant/icons/9/935_3.png new file mode 100644 index 00000000000..4b0994edc52 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/935_3.png differ diff --git a/public/images/pokemon/variant/icons/9/936_1.png b/public/images/pokemon/variant/icons/9/936_1.png new file mode 100644 index 00000000000..6c6cc516351 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/936_1.png differ diff --git a/public/images/pokemon/variant/icons/9/936_2.png b/public/images/pokemon/variant/icons/9/936_2.png new file mode 100644 index 00000000000..7faf7fc2363 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/936_2.png differ diff --git a/public/images/pokemon/variant/icons/9/936_3.png b/public/images/pokemon/variant/icons/9/936_3.png new file mode 100644 index 00000000000..37809ee2fcb Binary files /dev/null and b/public/images/pokemon/variant/icons/9/936_3.png differ diff --git a/public/images/pokemon/variant/icons/9/937_1.png b/public/images/pokemon/variant/icons/9/937_1.png new file mode 100644 index 00000000000..3539fb65dcd Binary files /dev/null and b/public/images/pokemon/variant/icons/9/937_1.png differ diff --git a/public/images/pokemon/variant/icons/9/937_2.png b/public/images/pokemon/variant/icons/9/937_2.png new file mode 100644 index 00000000000..8406702bdcb Binary files /dev/null and b/public/images/pokemon/variant/icons/9/937_2.png differ diff --git a/public/images/pokemon/variant/icons/9/937_3.png b/public/images/pokemon/variant/icons/9/937_3.png new file mode 100644 index 00000000000..d8cf7f54f63 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/937_3.png differ diff --git a/public/images/pokemon/variant/icons/9/937_9.png b/public/images/pokemon/variant/icons/9/937_9.png new file mode 100644 index 00000000000..b9ad59dca69 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/937_9.png differ diff --git a/public/images/pokemon/variant/icons/9/948_2.png b/public/images/pokemon/variant/icons/9/948_2.png new file mode 100644 index 00000000000..410f808a465 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/948_2.png differ diff --git a/public/images/pokemon/variant/icons/9/948_3.png b/public/images/pokemon/variant/icons/9/948_3.png new file mode 100644 index 00000000000..7fc4d7b32e4 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/948_3.png differ diff --git a/public/images/pokemon/variant/icons/9/949_2.png b/public/images/pokemon/variant/icons/9/949_2.png new file mode 100644 index 00000000000..ef70b3d7d96 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/949_2.png differ diff --git a/public/images/pokemon/variant/icons/9/949_3.png b/public/images/pokemon/variant/icons/9/949_3.png new file mode 100644 index 00000000000..4d0175d939e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/949_3.png differ diff --git a/public/images/pokemon/variant/icons/9/962_1.png b/public/images/pokemon/variant/icons/9/962_1.png new file mode 100644 index 00000000000..5b78aa0f0a7 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/962_1.png differ diff --git a/public/images/pokemon/variant/icons/9/962_2.png b/public/images/pokemon/variant/icons/9/962_2.png new file mode 100644 index 00000000000..7d018e82197 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/962_2.png differ diff --git a/public/images/pokemon/variant/icons/9/962_3.png b/public/images/pokemon/variant/icons/9/962_3.png new file mode 100644 index 00000000000..4bde28d426e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/962_3.png differ diff --git a/public/images/pokemon/variant/icons/9/967_2.png b/public/images/pokemon/variant/icons/9/967_2.png new file mode 100644 index 00000000000..a8b7935f1dc Binary files /dev/null and b/public/images/pokemon/variant/icons/9/967_2.png differ diff --git a/public/images/pokemon/variant/icons/9/967_3.png b/public/images/pokemon/variant/icons/9/967_3.png new file mode 100644 index 00000000000..b67e193543e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/967_3.png differ diff --git a/public/images/pokemon/variant/icons/9/967_3_GENERATED.png b/public/images/pokemon/variant/icons/9/967_3_GENERATED.png new file mode 100644 index 00000000000..b67e193543e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/967_3_GENERATED.png differ diff --git a/public/images/pokemon/variant/icons/9/968_2.png b/public/images/pokemon/variant/icons/9/968_2.png new file mode 100644 index 00000000000..fb3cbb3646c Binary files /dev/null and b/public/images/pokemon/variant/icons/9/968_2.png differ diff --git a/public/images/pokemon/variant/icons/9/968_3.png b/public/images/pokemon/variant/icons/9/968_3.png new file mode 100644 index 00000000000..c22bfc1b1be Binary files /dev/null and b/public/images/pokemon/variant/icons/9/968_3.png differ diff --git a/public/images/pokemon/variant/icons/9/969_2.png b/public/images/pokemon/variant/icons/9/969_2.png new file mode 100644 index 00000000000..824555cce19 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/969_2.png differ diff --git a/public/images/pokemon/variant/icons/9/969_3.png b/public/images/pokemon/variant/icons/9/969_3.png new file mode 100644 index 00000000000..38c7afd4559 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/969_3.png differ diff --git a/public/images/pokemon/variant/icons/9/970_2.png b/public/images/pokemon/variant/icons/9/970_2.png new file mode 100644 index 00000000000..3a2c45c9f49 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/970_2.png differ diff --git a/public/images/pokemon/variant/icons/9/970_3.png b/public/images/pokemon/variant/icons/9/970_3.png new file mode 100644 index 00000000000..01949deea0e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/970_3.png differ diff --git a/public/images/pokemon/variant/icons/9/973_1.png b/public/images/pokemon/variant/icons/9/973_1.png new file mode 100644 index 00000000000..3dafafe1f8d Binary files /dev/null and b/public/images/pokemon/variant/icons/9/973_1.png differ diff --git a/public/images/pokemon/variant/icons/9/973_2.png b/public/images/pokemon/variant/icons/9/973_2.png new file mode 100644 index 00000000000..0fb662c43fb Binary files /dev/null and b/public/images/pokemon/variant/icons/9/973_2.png differ diff --git a/public/images/pokemon/variant/icons/9/973_3.png b/public/images/pokemon/variant/icons/9/973_3.png new file mode 100644 index 00000000000..3b8e2b58d8c Binary files /dev/null and b/public/images/pokemon/variant/icons/9/973_3.png differ diff --git a/public/images/pokemon/variant/icons/9/978-curly_2.png b/public/images/pokemon/variant/icons/9/978-curly_2.png new file mode 100644 index 00000000000..14de557d03e Binary files /dev/null and b/public/images/pokemon/variant/icons/9/978-curly_2.png differ diff --git a/public/images/pokemon/variant/icons/9/978-curly_3.png b/public/images/pokemon/variant/icons/9/978-curly_3.png new file mode 100644 index 00000000000..1a2593c495b Binary files /dev/null and b/public/images/pokemon/variant/icons/9/978-curly_3.png differ diff --git a/public/images/pokemon/variant/icons/9/978-droopy_2.png b/public/images/pokemon/variant/icons/9/978-droopy_2.png new file mode 100644 index 00000000000..7cf300eaabf Binary files /dev/null and b/public/images/pokemon/variant/icons/9/978-droopy_2.png differ diff --git a/public/images/pokemon/variant/icons/9/978-droopy_3.png b/public/images/pokemon/variant/icons/9/978-droopy_3.png new file mode 100644 index 00000000000..915d4b96252 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/978-droopy_3.png differ diff --git a/public/images/pokemon/variant/icons/9/978-stretchy_2.png b/public/images/pokemon/variant/icons/9/978-stretchy_2.png new file mode 100644 index 00000000000..036be57dde2 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/978-stretchy_2.png differ diff --git a/public/images/pokemon/variant/icons/9/978-stretchy_3.png b/public/images/pokemon/variant/icons/9/978-stretchy_3.png new file mode 100644 index 00000000000..3d142b24f7a Binary files /dev/null and b/public/images/pokemon/variant/icons/9/978-stretchy_3.png differ diff --git a/public/images/pokemon/variant/icons/9/987_1.png b/public/images/pokemon/variant/icons/9/987_1.png new file mode 100644 index 00000000000..dccbbb60a04 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/987_1.png differ diff --git a/public/images/pokemon/variant/icons/9/987_2.png b/public/images/pokemon/variant/icons/9/987_2.png new file mode 100644 index 00000000000..9253f797f9d Binary files /dev/null and b/public/images/pokemon/variant/icons/9/987_2.png differ diff --git a/public/images/pokemon/variant/icons/9/987_3.png b/public/images/pokemon/variant/icons/9/987_3.png new file mode 100644 index 00000000000..27cd59ebab8 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/987_3.png differ diff --git a/public/images/pokemon/variant/icons/9/988_2.png b/public/images/pokemon/variant/icons/9/988_2.png new file mode 100644 index 00000000000..fcaf8393026 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/988_2.png differ diff --git a/public/images/pokemon/variant/icons/9/988_3.png b/public/images/pokemon/variant/icons/9/988_3.png new file mode 100644 index 00000000000..f2db83a8f50 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/988_3.png differ diff --git a/public/images/pokemon/variant/icons/9/994_2.png b/public/images/pokemon/variant/icons/9/994_2.png new file mode 100644 index 00000000000..00f5180e5b2 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/994_2.png differ diff --git a/public/images/pokemon/variant/icons/9/999_1.png b/public/images/pokemon/variant/icons/9/999_1.png new file mode 100644 index 00000000000..ea3cdfa0de5 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/999_1.png differ diff --git a/public/images/pokemon/variant/icons/9/999_2.png b/public/images/pokemon/variant/icons/9/999_2.png new file mode 100644 index 00000000000..05a374b7f30 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/999_2.png differ diff --git a/public/images/pokemon/variant/icons/9/999_3.png b/public/images/pokemon/variant/icons/9/999_3.png new file mode 100644 index 00000000000..84545a14d52 Binary files /dev/null and b/public/images/pokemon/variant/icons/9/999_3.png differ diff --git a/public/images/pokemon_icons_1v.json b/public/images/pokemon_icons_1v.json index 3f780b21bcf..1eabab3bb42 100644 --- a/public/images/pokemon_icons_1v.json +++ b/public/images/pokemon_icons_1v.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_1v.png", "format": "RGBA8888", "size": { - "w": 321, - "h": 321 + "w": 256, + "h": 340 }, "scale": 1, "frames": [ @@ -18,16 +18,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 14, - "w": 18, - "h": 15 + "x": 12, + "y": 15, + "w": 16, + "h": 13 }, "frame": { "x": 0, "y": 0, - "w": 18, - "h": 15 + "w": 16, + "h": 13 } }, { @@ -39,16 +39,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 14, - "w": 18, - "h": 15 + "x": 12, + "y": 15, + "w": 16, + "h": 13 }, "frame": { - "x": 18, + "x": 16, "y": 0, - "w": 18, - "h": 15 + "w": 16, + "h": 13 } }, { @@ -60,16 +60,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 + "x": 13, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 36, + "x": 32, "y": 0, - "w": 17, - "h": 16 + "w": 15, + "h": 14 } }, { @@ -81,16 +81,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 + "x": 13, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 53, + "x": 47, "y": 0, - "w": 17, - "h": 16 + "w": 15, + "h": 14 } }, { @@ -102,16 +102,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 22, - "h": 17 + "x": 11, + "y": 13, + "w": 20, + "h": 15 }, "frame": { - "x": 70, + "x": 62, "y": 0, - "w": 22, - "h": 17 + "w": 20, + "h": 15 } }, { @@ -123,16 +123,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 22, - "h": 17 + "x": 11, + "y": 13, + "w": 20, + "h": 15 }, "frame": { - "x": 92, + "x": 82, "y": 0, - "w": 22, - "h": 17 + "w": 20, + "h": 15 } }, { @@ -144,16 +144,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 23, - "h": 19 + "x": 10, + "y": 11, + "w": 21, + "h": 17 }, "frame": { - "x": 114, + "x": 102, "y": 0, - "w": 23, - "h": 19 + "w": 21, + "h": 17 } }, { @@ -165,16 +165,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 23, - "h": 19 + "x": 10, + "y": 11, + "w": 21, + "h": 17 }, "frame": { - "x": 137, + "x": 123, "y": 0, - "w": 23, - "h": 19 + "w": 21, + "h": 17 } }, { @@ -186,16 +186,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 20 + "x": 12, + "y": 10, + "w": 17, + "h": 18 }, "frame": { - "x": 160, + "x": 144, "y": 0, - "w": 19, - "h": 20 + "w": 17, + "h": 18 } }, { @@ -207,16 +207,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 20 + "x": 12, + "y": 10, + "w": 17, + "h": 18 }, "frame": { - "x": 179, + "x": 161, "y": 0, - "w": 19, - "h": 20 + "w": 17, + "h": 18 } }, { @@ -228,16 +228,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, - "h": 20 + "x": 11, + "y": 10, + "w": 18, + "h": 18 }, "frame": { - "x": 198, + "x": 178, "y": 0, - "w": 20, - "h": 20 + "w": 18, + "h": 18 } }, { @@ -249,16 +249,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, - "h": 20 + "x": 11, + "y": 10, + "w": 18, + "h": 18 }, "frame": { - "x": 218, + "x": 196, "y": 0, - "w": 20, - "h": 20 + "w": 18, + "h": 18 } }, { @@ -270,16 +270,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 20 + "x": 7, + "y": 8, + "w": 28, + "h": 18 }, "frame": { - "x": 238, + "x": 214, "y": 0, - "w": 30, - "h": 20 + "w": 28, + "h": 18 } }, { @@ -291,37 +291,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 20 + "x": 7, + "y": 8, + "w": 28, + "h": 18 }, "frame": { - "x": 268, - "y": 0, - "w": 30, - "h": 20 - } - }, - { - "filename": "147_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 22, - "h": 20 - }, - "frame": { - "x": 298, - "y": 0, - "w": 22, - "h": 20 + "x": 0, + "y": 13, + "w": 28, + "h": 18 } }, { @@ -333,16 +312,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 30, - "h": 20 + "x": 7, + "y": 8, + "w": 28, + "h": 18 }, "frame": { - "x": 0, + "x": 28, + "y": 14, + "w": 28, + "h": 18 + } + }, + { + "filename": "147_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 20, + "h": 18 + }, + "frame": { + "x": 56, "y": 15, - "w": 30, - "h": 20 + "w": 20, + "h": 18 } }, { @@ -354,16 +354,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 22, - "h": 20 + "x": 11, + "y": 10, + "w": 20, + "h": 18 }, "frame": { - "x": 30, - "y": 16, - "w": 22, - "h": 20 + "x": 76, + "y": 15, + "w": 20, + "h": 18 } }, { @@ -375,16 +375,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 + "x": 10, + "y": 9, + "w": 20, + "h": 19 }, "frame": { - "x": 52, + "x": 96, "y": 17, - "w": 22, - "h": 21 + "w": 20, + "h": 19 } }, { @@ -395,38 +395,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 74, - "y": 17, - "w": 22, - "h": 21 - } - }, - { - "filename": "29_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 10, - "y": 8, + "y": 9, "w": 20, - "h": 21 + "h": 19 }, "frame": { - "x": 96, - "y": 19, + "x": 116, + "y": 17, "w": 20, - "h": 21 + "h": 19 } }, { @@ -438,16 +417,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 21 + "x": 11, + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 116, - "y": 19, - "w": 20, - "h": 21 + "x": 136, + "y": 18, + "w": 18, + "h": 19 } }, { @@ -459,16 +438,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 21 + "x": 11, + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 136, - "y": 19, - "w": 20, - "h": 21 + "x": 154, + "y": 18, + "w": 18, + "h": 19 } }, { @@ -480,16 +459,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 20, - "h": 21 + "x": 12, + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 156, - "y": 20, - "w": 20, - "h": 21 + "x": 172, + "y": 18, + "w": 18, + "h": 19 } }, { @@ -501,37 +480,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 20, - "h": 21 + "x": 12, + "y": 9, + "w": 18, + "h": 19 }, "frame": { - "x": 176, - "y": 20, - "w": 20, - "h": 21 - } - }, - { - "filename": "118_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 26, - "h": 21 - }, - "frame": { - "x": 196, - "y": 20, - "w": 26, - "h": 21 + "x": 190, + "y": 18, + "w": 18, + "h": 19 } }, { @@ -543,16 +501,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 26, - "h": 21 + "x": 9, + "y": 9, + "w": 24, + "h": 19 }, "frame": { - "x": 222, - "y": 20, - "w": 26, - "h": 21 + "x": 208, + "y": 18, + "w": 24, + "h": 19 } }, { @@ -564,16 +522,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 26, - "h": 21 + "x": 9, + "y": 9, + "w": 24, + "h": 19 }, "frame": { - "x": 248, - "y": 20, - "w": 26, - "h": 21 + "x": 232, + "y": 18, + "w": 24, + "h": 19 } }, { @@ -585,16 +543,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 + "x": 11, + "y": 9, + "w": 19, + "h": 19 }, "frame": { - "x": 274, - "y": 20, - "w": 21, - "h": 21 + "x": 0, + "y": 31, + "w": 19, + "h": 19 } }, { @@ -606,16 +564,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 + "x": 11, + "y": 9, + "w": 19, + "h": 19 }, "frame": { - "x": 295, - "y": 20, - "w": 21, - "h": 21 + "x": 19, + "y": 32, + "w": 19, + "h": 19 } }, { @@ -627,16 +585,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 + "x": 11, + "y": 9, + "w": 19, + "h": 19 }, "frame": { - "x": 0, - "y": 35, - "w": 21, - "h": 21 + "x": 38, + "y": 33, + "w": 19, + "h": 19 } }, { @@ -648,16 +606,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 31, - "h": 21 + "x": 6, + "y": 7, + "w": 29, + "h": 19 }, "frame": { - "x": 21, - "y": 36, - "w": 31, - "h": 21 + "x": 57, + "y": 33, + "w": 29, + "h": 19 } }, { @@ -669,37 +627,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 31, - "h": 21 + "x": 6, + "y": 7, + "w": 29, + "h": 19 }, "frame": { - "x": 52, - "y": 38, - "w": 31, - "h": 21 - } - }, - { - "filename": "145_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 31, - "h": 21 - }, - "frame": { - "x": 83, - "y": 40, - "w": 31, - "h": 21 + "x": 86, + "y": 36, + "w": 29, + "h": 19 } }, { @@ -711,16 +648,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 22 + "x": 10, + "y": 8, + "w": 21, + "h": 20 }, "frame": { - "x": 114, - "y": 40, - "w": 23, - "h": 22 + "x": 115, + "y": 36, + "w": 21, + "h": 20 + } + }, + { + "filename": "145_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 29, + "h": 19 + }, + "frame": { + "x": 136, + "y": 37, + "w": 29, + "h": 19 } }, { @@ -732,16 +690,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 22 + "x": 10, + "y": 8, + "w": 21, + "h": 20 }, "frame": { - "x": 137, - "y": 41, - "w": 23, - "h": 22 + "x": 165, + "y": 37, + "w": 21, + "h": 20 } }, { @@ -753,16 +711,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 22 + "x": 11, + "y": 7, + "w": 21, + "h": 20 }, "frame": { - "x": 160, - "y": 41, - "w": 23, - "h": 22 + "x": 186, + "y": 37, + "w": 21, + "h": 20 } }, { @@ -774,16 +732,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 22 + "x": 11, + "y": 7, + "w": 21, + "h": 20 }, "frame": { - "x": 183, - "y": 41, - "w": 23, - "h": 22 + "x": 207, + "y": 37, + "w": 21, + "h": 20 } }, { @@ -795,79 +753,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 206, - "y": 41, - "w": 23, - "h": 22 - } - }, - { - "filename": "46_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, + "x": 11, "y": 7, - "w": 24, - "h": 22 + "w": 21, + "h": 20 }, "frame": { - "x": 229, - "y": 41, - "w": 24, - "h": 22 - } - }, - { - "filename": "46_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 253, - "y": 41, - "w": 24, - "h": 22 - } - }, - { - "filename": "46_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 277, - "y": 41, - "w": 24, - "h": 22 + "x": 228, + "y": 37, + "w": 21, + "h": 20 } }, { @@ -879,58 +774,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 + "x": 10, + "y": 8, + "w": 19, + "h": 20 }, "frame": { "x": 0, - "y": 56, - "w": 21, - "h": 22 - } - }, - { - "filename": "70_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 21, - "y": 57, - "w": 24, - "h": 22 - } - }, - { - "filename": "70_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 45, - "y": 59, - "w": 24, - "h": 22 + "y": 50, + "w": 19, + "h": 20 } }, { @@ -942,16 +795,121 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 + "x": 10, + "y": 8, + "w": 19, + "h": 20 }, "frame": { - "x": 69, - "y": 61, - "w": 21, - "h": 22 + "x": 19, + "y": 51, + "w": 19, + "h": 20 + } + }, + { + "filename": "46_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 38, + "y": 52, + "w": 22, + "h": 20 + } + }, + { + "filename": "46_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 60, + "y": 52, + "w": 22, + "h": 20 + } + }, + { + "filename": "46_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 82, + "y": 55, + "w": 22, + "h": 20 + } + }, + { + "filename": "70_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 104, + "y": 56, + "w": 22, + "h": 20 + } + }, + { + "filename": "70_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 126, + "y": 56, + "w": 22, + "h": 20 } }, { @@ -962,38 +920,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 - }, - "frame": { - "x": 90, - "y": 61, - "w": 21, - "h": 22 - } - }, - { - "filename": "52_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 23, - "h": 23 + "y": 8, + "w": 19, + "h": 20 }, "frame": { - "x": 111, - "y": 62, - "w": 23, - "h": 23 + "x": 148, + "y": 57, + "w": 19, + "h": 20 } }, { @@ -1005,16 +942,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 22 + "x": 8, + "y": 8, + "w": 25, + "h": 20 }, "frame": { - "x": 134, - "y": 63, - "w": 27, - "h": 22 + "x": 167, + "y": 57, + "w": 25, + "h": 20 } }, { @@ -1026,16 +963,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 22 + "x": 8, + "y": 8, + "w": 25, + "h": 20 }, "frame": { - "x": 161, - "y": 63, - "w": 27, - "h": 22 + "x": 192, + "y": 57, + "w": 25, + "h": 20 } }, { @@ -1047,79 +984,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 22 + "x": 8, + "y": 8, + "w": 25, + "h": 20 }, "frame": { - "x": 188, - "y": 63, - "w": 27, - "h": 22 - } - }, - { - "filename": "144_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 215, - "y": 63, - "w": 29, - "h": 22 - } - }, - { - "filename": "144_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 244, - "y": 63, - "w": 29, - "h": 22 - } - }, - { - "filename": "144_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 22 - }, - "frame": { - "x": 273, - "y": 63, - "w": 29, - "h": 22 + "x": 217, + "y": 57, + "w": 25, + "h": 20 } }, { @@ -1131,268 +1005,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 21, - "h": 23 + "x": 10, + "y": 7, + "w": 19, + "h": 21 }, "frame": { "x": 0, - "y": 78, - "w": 21, - "h": 23 - } - }, - { - "filename": "52_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 23 - }, - "frame": { - "x": 21, - "y": 79, - "w": 23, - "h": 23 - } - }, - { - "filename": "52_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 23 - }, - "frame": { - "x": 44, - "y": 81, - "w": 23, - "h": 23 - } - }, - { - "filename": "92_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 67, - "y": 83, - "w": 25, - "h": 23 - } - }, - { - "filename": "92_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 92, - "y": 85, - "w": 25, - "h": 23 - } - }, - { - "filename": "92_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 117, - "y": 85, - "w": 25, - "h": 23 - } - }, - { - "filename": "127_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 142, - "y": 85, - "w": 25, - "h": 23 - } - }, - { - "filename": "127_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 167, - "y": 85, - "w": 25, - "h": 23 - } - }, - { - "filename": "131_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 23 - }, - "frame": { - "x": 192, - "y": 85, - "w": 26, - "h": 23 - } - }, - { - "filename": "131_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 23 - }, - "frame": { - "x": 218, - "y": 85, - "w": 26, - "h": 23 - } - }, - { - "filename": "134_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 244, - "y": 85, - "w": 25, - "h": 23 - } - }, - { - "filename": "134_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 269, - "y": 85, - "w": 25, - "h": 23 - } - }, - { - "filename": "135_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 294, - "y": 85, - "w": 22, - "h": 23 + "y": 70, + "w": 19, + "h": 21 } }, { @@ -1404,20 +1026,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 21, - "h": 23 + "x": 10, + "y": 7, + "w": 19, + "h": 21 }, "frame": { - "x": 0, - "y": 101, - "w": 21, - "h": 23 + "x": 19, + "y": 71, + "w": 19, + "h": 21 } }, { - "filename": "135_2", + "filename": "144_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1425,20 +1047,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 + "x": 7, + "y": 7, + "w": 27, + "h": 20 }, "frame": { - "x": 21, - "y": 102, - "w": 22, - "h": 23 + "x": 38, + "y": 72, + "w": 27, + "h": 20 } }, { - "filename": "135_3", + "filename": "144_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1446,41 +1068,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 43, - "y": 104, - "w": 22, - "h": 23 - } - }, - { - "filename": "136_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 + "x": 7, + "y": 7, + "w": 27, + "h": 20 }, "frame": { "x": 65, - "y": 106, - "w": 25, - "h": 23 + "y": 75, + "w": 27, + "h": 20 } }, { - "filename": "136_2", + "filename": "144_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1488,20 +1089,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 + "x": 7, + "y": 7, + "w": 27, + "h": 20 }, "frame": { - "x": 90, - "y": 108, - "w": 25, - "h": 23 + "x": 92, + "y": 76, + "w": 27, + "h": 20 } }, { - "filename": "136_3", + "filename": "52_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1509,20 +1110,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 + "x": 11, + "y": 7, + "w": 21, + "h": 21 }, "frame": { - "x": 115, - "y": 108, - "w": 25, - "h": 23 + "x": 119, + "y": 76, + "w": 21, + "h": 21 } }, { - "filename": "8_2", + "filename": "52_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1530,20 +1131,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 26, - "h": 24 + "x": 11, + "y": 7, + "w": 21, + "h": 21 }, "frame": { "x": 140, - "y": 108, - "w": 26, - "h": 24 + "y": 77, + "w": 21, + "h": 21 } }, { - "filename": "8_3", + "filename": "52_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1551,16 +1152,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 26, - "h": 24 + "x": 11, + "y": 7, + "w": 21, + "h": 21 }, "frame": { - "x": 166, - "y": 108, - "w": 26, - "h": 24 + "x": 161, + "y": 77, + "w": 21, + "h": 21 + } + }, + { + "filename": "92_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 182, + "y": 77, + "w": 23, + "h": 21 + } + }, + { + "filename": "92_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 205, + "y": 77, + "w": 23, + "h": 21 + } + }, + { + "filename": "92_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 228, + "y": 77, + "w": 23, + "h": 21 } }, { @@ -1572,16 +1236,268 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 24 + "x": 11, + "y": 6, + "w": 19, + "h": 22 }, "frame": { - "x": 192, - "y": 108, - "w": 21, - "h": 24 + "x": 0, + "y": 91, + "w": 19, + "h": 22 + } + }, + { + "filename": "127_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 19, + "y": 92, + "w": 23, + "h": 21 + } + }, + { + "filename": "127_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 42, + "y": 92, + "w": 23, + "h": 21 + } + }, + { + "filename": "131_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 65, + "y": 95, + "w": 24, + "h": 21 + } + }, + { + "filename": "131_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 89, + "y": 96, + "w": 24, + "h": 21 + } + }, + { + "filename": "134_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 113, + "y": 97, + "w": 23, + "h": 21 + } + }, + { + "filename": "134_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 136, + "y": 98, + "w": 23, + "h": 21 + } + }, + { + "filename": "135_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 159, + "y": 98, + "w": 20, + "h": 21 + } + }, + { + "filename": "135_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 179, + "y": 98, + "w": 20, + "h": 21 + } + }, + { + "filename": "135_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 199, + "y": 98, + "w": 20, + "h": 21 + } + }, + { + "filename": "136_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 219, + "y": 98, + "w": 23, + "h": 21 + } + }, + { + "filename": "136_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 0, + "y": 113, + "w": 23, + "h": 21 + } + }, + { + "filename": "136_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 23, + "y": 113, + "w": 23, + "h": 21 } }, { @@ -1592,21 +1508,42 @@ "w": 40, "h": 30 }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 46, + "y": 113, + "w": 19, + "h": 22 + } + }, + { + "filename": "8_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, "spriteSourceSize": { "x": 10, - "y": 5, - "w": 21, - "h": 24 + "y": 6, + "w": 24, + "h": 22 }, "frame": { - "x": 213, - "y": 108, - "w": 21, - "h": 24 + "x": 65, + "y": 116, + "w": 24, + "h": 22 } }, { - "filename": "42_1", + "filename": "8_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1614,58 +1551,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 28, - "h": 24 + "x": 10, + "y": 6, + "w": 24, + "h": 22 }, "frame": { - "x": 234, - "y": 108, - "w": 28, - "h": 24 - } - }, - { - "filename": "42_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 262, - "y": 108, - "w": 28, - "h": 24 - } - }, - { - "filename": "42_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 290, - "y": 108, - "w": 28, - "h": 24 + "x": 89, + "y": 117, + "w": 24, + "h": 22 } }, { @@ -1677,16 +1572,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 + "x": 9, + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 0, - "y": 125, - "w": 24, - "h": 24 + "x": 113, + "y": 118, + "w": 22, + "h": 22 + } + }, + { + "filename": "42_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 26, + "h": 22 + }, + "frame": { + "x": 135, + "y": 119, + "w": 26, + "h": 22 + } + }, + { + "filename": "42_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 26, + "h": 22 + }, + "frame": { + "x": 161, + "y": 119, + "w": 26, + "h": 22 + } + }, + { + "filename": "42_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 26, + "h": 22 + }, + "frame": { + "x": 187, + "y": 119, + "w": 26, + "h": 22 } }, { @@ -1698,184 +1656,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 + "x": 9, + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 24, - "y": 127, - "w": 24, - "h": 24 - } - }, - { - "filename": "47_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 129, - "w": 24, - "h": 24 - } - }, - { - "filename": "51_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 72, - "y": 131, - "w": 24, - "h": 24 - } - }, - { - "filename": "51_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 96, - "y": 131, - "w": 24, - "h": 24 - } - }, - { - "filename": "53_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 120, - "y": 132, - "w": 25, - "h": 24 - } - }, - { - "filename": "53_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 145, - "y": 132, - "w": 25, - "h": 24 - } - }, - { - "filename": "53_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 170, - "y": 132, - "w": 25, - "h": 24 - } - }, - { - "filename": "83_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 195, - "y": 132, - "w": 28, - "h": 24 - } - }, - { - "filename": "83_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 223, - "y": 132, - "w": 28, - "h": 24 + "x": 213, + "y": 119, + "w": 22, + "h": 22 } }, { @@ -1887,16 +1677,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 + "x": 10, + "y": 6, + "w": 21, + "h": 22 }, "frame": { - "x": 251, - "y": 132, - "w": 23, - "h": 24 + "x": 235, + "y": 119, + "w": 21, + "h": 22 + } + }, + { + "filename": "47_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 0, + "y": 134, + "w": 22, + "h": 22 + } + }, + { + "filename": "51_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 22, + "y": 134, + "w": 22, + "h": 22 } }, { @@ -1908,16 +1740,142 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 + "x": 10, + "y": 6, + "w": 21, + "h": 22 }, "frame": { - "x": 274, - "y": 132, + "x": 44, + "y": 135, + "w": 21, + "h": 22 + } + }, + { + "filename": "51_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 65, + "y": 138, + "w": 22, + "h": 22 + } + }, + { + "filename": "53_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, "w": 23, - "h": 24 + "h": 22 + }, + "frame": { + "x": 87, + "y": 139, + "w": 23, + "h": 22 + } + }, + { + "filename": "53_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 110, + "y": 140, + "w": 23, + "h": 22 + } + }, + { + "filename": "53_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 133, + "y": 141, + "w": 23, + "h": 22 + } + }, + { + "filename": "83_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 156, + "y": 141, + "w": 26, + "h": 22 + } + }, + { + "filename": "83_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 182, + "y": 141, + "w": 26, + "h": 22 } }, { @@ -1929,16 +1887,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 + "x": 10, + "y": 6, + "w": 21, + "h": 22 }, "frame": { - "x": 297, - "y": 132, - "w": 23, - "h": 24 + "x": 208, + "y": 141, + "w": 21, + "h": 22 } }, { @@ -1950,16 +1908,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 + "x": 9, + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 0, - "y": 149, - "w": 24, - "h": 24 + "x": 229, + "y": 141, + "w": 22, + "h": 22 } }, { @@ -1971,16 +1929,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 24 + "x": 9, + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 24, - "y": 151, - "w": 24, - "h": 24 + "x": 0, + "y": 156, + "w": 22, + "h": 22 } }, { @@ -1991,185 +1949,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 48, - "y": 153, - "w": 24, - "h": 24 - } - }, - { - "filename": "142_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 31, - "h": 24 - }, - "frame": { - "x": 72, - "y": 155, - "w": 31, - "h": 24 - } - }, - { - "filename": "142_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 31, - "h": 24 - }, - "frame": { - "x": 103, - "y": 156, - "w": 31, - "h": 24 - } - }, - { - "filename": "148_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 134, - "y": 156, - "w": 24, - "h": 24 - } - }, - { - "filename": "149_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 158, - "y": 156, - "w": 27, - "h": 24 - } - }, - { - "filename": "149_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 185, - "y": 156, - "w": 27, - "h": 24 - } - }, - { - "filename": "31_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 8, - "y": 4, - "w": 25, - "h": 25 + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 212, + "x": 22, "y": 156, - "w": 25, - "h": 25 - } - }, - { - "filename": "31_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 25 - }, - "frame": { - "x": 237, - "y": 156, - "w": 25, - "h": 25 - } - }, - { - "filename": "31_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 25 - }, - "frame": { - "x": 262, - "y": 156, - "w": 25, - "h": 25 + "w": 22, + "h": 22 } }, { @@ -2181,16 +1971,184 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 + "x": 10, + "y": 5, + "w": 20, + "h": 23 }, "frame": { - "x": 287, - "y": 156, + "x": 44, + "y": 157, + "w": 20, + "h": 23 + } + }, + { + "filename": "148_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, "w": 22, - "h": 25 + "h": 22 + }, + "frame": { + "x": 64, + "y": 160, + "w": 22, + "h": 22 + } + }, + { + "filename": "31_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 86, + "y": 161, + "w": 23, + "h": 23 + } + }, + { + "filename": "31_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 109, + "y": 162, + "w": 23, + "h": 23 + } + }, + { + "filename": "142_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 29, + "h": 22 + }, + "frame": { + "x": 132, + "y": 163, + "w": 29, + "h": 22 + } + }, + { + "filename": "142_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 29, + "h": 22 + }, + "frame": { + "x": 161, + "y": 163, + "w": 29, + "h": 22 + } + }, + { + "filename": "149_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 190, + "y": 163, + "w": 25, + "h": 22 + } + }, + { + "filename": "149_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 215, + "y": 163, + "w": 25, + "h": 22 + } + }, + { + "filename": "31_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 0, + "y": 178, + "w": 23, + "h": 23 } }, { @@ -2202,37 +2160,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 + "x": 10, + "y": 5, + "w": 20, + "h": 23 }, "frame": { - "x": 0, - "y": 173, - "w": 22, - "h": 25 - } - }, - { - "filename": "77_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 22, - "y": 175, - "w": 26, - "h": 25 + "x": 23, + "y": 178, + "w": 20, + "h": 23 } }, { @@ -2244,205 +2181,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 25 + "x": 12, + "y": 5, + "w": 20, + "h": 23 }, "frame": { - "x": 48, - "y": 177, - "w": 22, - "h": 25 - } - }, - { - "filename": "71_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 70, - "y": 179, - "w": 30, - "h": 25 - } - }, - { - "filename": "71_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 100, + "x": 43, "y": 180, - "w": 30, - "h": 25 - } - }, - { - "filename": "77_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 130, - "y": 180, - "w": 26, - "h": 25 - } - }, - { - "filename": "86_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 156, - "y": 180, - "w": 27, - "h": 25 - } - }, - { - "filename": "86_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 183, - "y": 180, - "w": 27, - "h": 25 - } - }, - { - "filename": "86_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 210, - "y": 181, - "w": 27, - "h": 25 - } - }, - { - "filename": "87_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 237, - "y": 181, - "w": 27, - "h": 25 - } - }, - { - "filename": "87_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 264, - "y": 181, - "w": 27, - "h": 25 - } - }, - { - "filename": "87_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 291, - "y": 181, - "w": 27, - "h": 25 + "w": 20, + "h": 23 } }, { @@ -2454,20 +2202,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 25 + "x": 12, + "y": 5, + "w": 20, + "h": 23 }, "frame": { - "x": 0, - "y": 198, - "w": 22, - "h": 25 + "x": 63, + "y": 182, + "w": 20, + "h": 23 } }, { - "filename": "94_1", + "filename": "86_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -2475,16 +2223,163 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 26, - "h": 26 + "x": 8, + "y": 5, + "w": 25, + "h": 23 }, "frame": { - "x": 22, - "y": 200, - "w": 26, - "h": 26 + "x": 83, + "y": 184, + "w": 25, + "h": 23 + } + }, + { + "filename": "71_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 108, + "y": 185, + "w": 28, + "h": 23 + } + }, + { + "filename": "71_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 136, + "y": 185, + "w": 28, + "h": 23 + } + }, + { + "filename": "86_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 164, + "y": 185, + "w": 25, + "h": 23 + } + }, + { + "filename": "86_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 189, + "y": 185, + "w": 25, + "h": 23 + } + }, + { + "filename": "87_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 214, + "y": 185, + "w": 25, + "h": 23 + } + }, + { + "filename": "87_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 0, + "y": 201, + "w": 25, + "h": 23 + } + }, + { + "filename": "87_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 25, + "y": 203, + "w": 25, + "h": 23 } }, { @@ -2496,37 +2391,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 32, - "h": 26 + "x": 5, + "y": 4, + "w": 30, + "h": 24 }, "frame": { - "x": 48, - "y": 204, - "w": 32, - "h": 26 - } - }, - { - "filename": "3_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 32, - "h": 26 - }, - "frame": { - "x": 80, + "x": 50, "y": 205, - "w": 32, - "h": 26 + "w": 30, + "h": 24 } }, { @@ -2538,16 +2412,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 26 + "x": 7, + "y": 4, + "w": 25, + "h": 24 }, "frame": { - "x": 112, - "y": 205, - "w": 27, - "h": 26 + "x": 80, + "y": 207, + "w": 25, + "h": 24 + } + }, + { + "filename": "3_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 30, + "h": 24 + }, + "frame": { + "x": 105, + "y": 208, + "w": 30, + "h": 24 } }, { @@ -2559,16 +2454,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 26 + "x": 7, + "y": 4, + "w": 25, + "h": 24 }, "frame": { - "x": 139, - "y": 205, - "w": 27, - "h": 26 + "x": 135, + "y": 208, + "w": 25, + "h": 24 + } + }, + { + "filename": "94_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 160, + "y": 208, + "w": 24, + "h": 24 } }, { @@ -2580,16 +2496,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 26, - "h": 26 + "x": 7, + "y": 4, + "w": 24, + "h": 24 }, "frame": { - "x": 166, - "y": 205, - "w": 26, - "h": 26 + "x": 184, + "y": 208, + "w": 24, + "h": 24 } }, { @@ -2601,100 +2517,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 192, - "y": 206, - "w": 26, - "h": 26 - } - }, - { - "filename": "142-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, + "x": 7, "y": 4, - "w": 34, - "h": 26 + "w": 24, + "h": 24 }, "frame": { - "x": 218, - "y": 206, - "w": 34, - "h": 26 - } - }, - { - "filename": "142-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 34, - "h": 26 - }, - "frame": { - "x": 252, - "y": 206, - "w": 34, - "h": 26 - } - }, - { - "filename": "127-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 33, - "h": 27 - }, - "frame": { - "x": 286, - "y": 206, - "w": 33, - "h": 27 - } - }, - { - "filename": "127-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 33, - "h": 27 - }, - "frame": { - "x": 0, - "y": 226, - "w": 33, - "h": 27 + "x": 208, + "y": 208, + "w": 24, + "h": 24 } }, { @@ -2706,16 +2538,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 27 + "x": 9, + "y": 2, + "w": 23, + "h": 25 }, "frame": { - "x": 33, - "y": 230, - "w": 25, - "h": 27 + "x": 232, + "y": 208, + "w": 23, + "h": 25 } }, { @@ -2727,16 +2559,100 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 27 + "x": 9, + "y": 2, + "w": 23, + "h": 25 }, "frame": { - "x": 58, + "x": 0, + "y": 224, + "w": 23, + "h": 25 + } + }, + { + "filename": "142-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 32, + "h": 24 + }, + "frame": { + "x": 23, + "y": 229, + "w": 32, + "h": 24 + } + }, + { + "filename": "142-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 32, + "h": 24 + }, + "frame": { + "x": 55, "y": 231, - "w": 25, - "h": 27 + "w": 32, + "h": 24 + } + }, + { + "filename": "127-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 31, + "h": 25 + }, + "frame": { + "x": 87, + "y": 232, + "w": 31, + "h": 25 + } + }, + { + "filename": "127-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 31, + "h": 25 + }, + "frame": { + "x": 118, + "y": 232, + "w": 31, + "h": 25 } }, { @@ -2748,16 +2664,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 31, - "h": 28 + "x": 6, + "y": 2, + "w": 29, + "h": 26 }, "frame": { - "x": 83, - "y": 231, - "w": 31, - "h": 28 + "x": 149, + "y": 232, + "w": 29, + "h": 26 } }, { @@ -2768,59 +2684,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 31, - "h": 28 - }, - "frame": { - "x": 114, - "y": 231, - "w": 31, - "h": 28 - } - }, - { - "filename": "78_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 6, - "y": 1, - "w": 31, - "h": 28 + "y": 2, + "w": 29, + "h": 26 }, "frame": { - "x": 145, - "y": 231, - "w": 31, - "h": 28 - } - }, - { - "filename": "78_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 31, - "h": 28 - }, - "frame": { - "x": 176, + "x": 178, "y": 232, - "w": 31, - "h": 28 + "w": 29, + "h": 26 } }, { @@ -2832,16 +2706,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 32, - "h": 28 + "x": 3, + "y": 2, + "w": 30, + "h": 26 }, "frame": { "x": 207, - "y": 232, - "w": 32, - "h": 28 + "y": 233, + "w": 30, + "h": 26 + } + }, + { + "filename": "52-gigantamax_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 23, + "h": 30 + }, + "frame": { + "x": 0, + "y": 249, + "w": 23, + "h": 30 } }, { @@ -2853,16 +2748,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 32, - "h": 28 + "x": 3, + "y": 2, + "w": 30, + "h": 26 }, "frame": { - "x": 239, - "y": 232, - "w": 32, - "h": 28 + "x": 23, + "y": 253, + "w": 30, + "h": 26 } }, { @@ -2874,58 +2769,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 32, - "h": 28 + "x": 3, + "y": 2, + "w": 30, + "h": 26 }, "frame": { - "x": 271, - "y": 233, - "w": 32, - "h": 28 - } - }, - { - "filename": "150-mega-x_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 23, - "h": 28 - }, - "frame": { - "x": 0, - "y": 253, - "w": 23, - "h": 28 - } - }, - { - "filename": "150-mega-x_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 23, - "h": 28 - }, - "frame": { - "x": 23, - "y": 257, - "w": 23, - "h": 28 + "x": 53, + "y": 255, + "w": 30, + "h": 26 } }, { @@ -2937,16 +2790,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, "y": 0, - "w": 31, - "h": 29 + "w": 29, + "h": 28 }, "frame": { - "x": 46, - "y": 258, - "w": 31, - "h": 29 + "x": 83, + "y": 257, + "w": 29, + "h": 28 } }, { @@ -2958,16 +2811,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, "y": 0, - "w": 31, - "h": 29 + "w": 29, + "h": 28 }, "frame": { - "x": 77, - "y": 259, - "w": 31, - "h": 29 + "x": 112, + "y": 257, + "w": 29, + "h": 28 + } + }, + { + "filename": "9-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 30, + "h": 28 + }, + "frame": { + "x": 141, + "y": 258, + "w": 30, + "h": 28 + } + }, + { + "filename": "9-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 30, + "h": 28 + }, + "frame": { + "x": 171, + "y": 258, + "w": 30, + "h": 28 } }, { @@ -2979,16 +2874,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, "y": 0, - "w": 33, - "h": 29 + "w": 31, + "h": 28 }, "frame": { - "x": 108, + "x": 201, "y": 259, - "w": 33, - "h": 29 + "w": 31, + "h": 28 + } + }, + { + "filename": "52-gigantamax_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 23, + "h": 30 + }, + "frame": { + "x": 232, + "y": 259, + "w": 23, + "h": 30 } }, { @@ -3000,15 +2916,78 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, "y": 0, - "w": 33, + "w": 31, + "h": 28 + }, + "frame": { + "x": 0, + "y": 279, + "w": 31, + "h": 28 + } + }, + { + "filename": "94-mega_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 34, "h": 29 }, "frame": { - "x": 141, - "y": 259, - "w": 33, + "x": 31, + "y": 281, + "w": 34, + "h": 29 + } + }, + { + "filename": "94-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 34, + "h": 29 + }, + "frame": { + "x": 65, + "y": 285, + "w": 34, + "h": 29 + } + }, + { + "filename": "94-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 34, + "h": 29 + }, + "frame": { + "x": 99, + "y": 285, + "w": 34, "h": 29 } }, @@ -3021,15 +3000,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 4, "y": 0, - "w": 34, + "w": 32, "h": 30 }, "frame": { - "x": 174, - "y": 260, - "w": 34, + "x": 133, + "y": 286, + "w": 32, "h": 30 } }, @@ -3042,144 +3021,18 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 30 - }, - "frame": { - "x": 208, - "y": 260, - "w": 34, - "h": 30 - } - }, - { - "filename": "52-gigantamax_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 242, - "y": 260, - "w": 25, - "h": 30 - } - }, - { - "filename": "9-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, + "x": 4, "y": 0, "w": 32, "h": 30 }, "frame": { - "x": 267, - "y": 261, + "x": 165, + "y": 286, "w": 32, "h": 30 } }, - { - "filename": "150-mega-y_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 22, - "h": 30 - }, - "frame": { - "x": 299, - "y": 261, - "w": 22, - "h": 30 - } - }, - { - "filename": "150-mega-y_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 22, - "h": 30 - }, - "frame": { - "x": 0, - "y": 281, - "w": 22, - "h": 30 - } - }, - { - "filename": "9-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 32, - "h": 30 - }, - "frame": { - "x": 22, - "y": 287, - "w": 32, - "h": 30 - } - }, - { - "filename": "52-gigantamax_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 54, - "y": 288, - "w": 25, - "h": 30 - } - }, { "filename": "52-gigantamax_3", "rotated": false, @@ -3189,15 +3042,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 0, - "w": 25, + "w": 23, "h": 30 }, "frame": { - "x": 79, - "y": 288, - "w": 25, + "x": 197, + "y": 287, + "w": 23, "h": 30 } }, @@ -3210,15 +3063,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 4, "y": 0, - "w": 34, + "w": 32, "h": 30 }, "frame": { - "x": 104, - "y": 288, - "w": 34, + "x": 220, + "y": 289, + "w": 32, "h": 30 } }, @@ -3231,15 +3084,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 4, "y": 0, - "w": 34, + "w": 32, "h": 30 }, "frame": { - "x": 138, - "y": 288, - "w": 34, + "x": 0, + "y": 310, + "w": 32, "h": 30 } }, @@ -3252,78 +3105,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 4, "y": 0, - "w": 34, + "w": 32, "h": 30 }, "frame": { - "x": 172, - "y": 290, - "w": 34, - "h": 30 - } - }, - { - "filename": "94-mega_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 36, - "h": 30 - }, - "frame": { - "x": 206, - "y": 290, - "w": 36, - "h": 30 - } - }, - { - "filename": "94-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 36, - "h": 30 - }, - "frame": { - "x": 242, - "y": 291, - "w": 36, - "h": 30 - } - }, - { - "filename": "94-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 36, - "h": 30 - }, - "frame": { - "x": 278, - "y": 291, - "w": 36, + "x": 32, + "y": 310, + "w": 32, "h": 30 } } @@ -3333,6 +3123,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:0080edf96b67b6179773686415ba468f:18f5a0fa8b53743fd7c0a0576eef16bc:2fc2d7db306a93e9369e20846ccef45c$" + "smartupdate": "$TexturePacker:SmartUpdate:2f7f2b0dab2370af11cacaa8d1d43a05:b747b3456f3da0be250456bebe1b9e90:2fc2d7db306a93e9369e20846ccef45c$" } } diff --git a/public/images/pokemon_icons_1v.png b/public/images/pokemon_icons_1v.png index cb1e73cb6a1..2d52761bf02 100644 Binary files a/public/images/pokemon_icons_1v.png and b/public/images/pokemon_icons_1v.png differ diff --git a/public/images/pokemon_icons_2v.json b/public/images/pokemon_icons_2v.json index 73ed2e2f0bf..5dda84199f1 100644 --- a/public/images/pokemon_icons_2v.json +++ b/public/images/pokemon_icons_2v.json @@ -4,13 +4,13 @@ "image": "pokemon_icons_2v.png", "format": "RGBA8888", "size": { - "w": 206, - "h": 206 + "w": 254, + "h": 145 }, "scale": 1, "frames": [ { - "filename": "249_2", + "filename": "173_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -18,20 +18,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 30 + "x": 12, + "y": 12, + "w": 16, + "h": 16 }, "frame": { "x": 0, "y": 0, - "w": 34, - "h": 30 + "w": 16, + "h": 16 } }, { - "filename": "249_3", + "filename": "183_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -39,20 +39,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 30 + "x": 8, + "y": 11, + "w": 23, + "h": 17 }, "frame": { - "x": 34, + "x": 16, "y": 0, - "w": 34, - "h": 30 + "w": 23, + "h": 17 } }, { - "filename": "250_2", + "filename": "183_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -60,20 +60,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 31, - "h": 30 + "x": 8, + "y": 11, + "w": 23, + "h": 17 }, "frame": { - "x": 68, + "x": 39, "y": 0, - "w": 31, - "h": 30 + "w": 23, + "h": 17 } }, { - "filename": "250_3", + "filename": "175_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -81,20 +81,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 31, - "h": 30 + "x": 12, + "y": 10, + "w": 16, + "h": 18 }, "frame": { - "x": 99, + "x": 62, "y": 0, - "w": 31, - "h": 30 + "w": 16, + "h": 18 } }, { - "filename": "212-mega_1", + "filename": "175_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -102,20 +102,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 30, - "h": 30 + "x": 12, + "y": 10, + "w": 16, + "h": 18 }, "frame": { - "x": 130, + "x": 78, "y": 0, - "w": 30, - "h": 30 + "w": 16, + "h": 18 } }, { - "filename": "212-mega_2", + "filename": "175_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -123,16 +123,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 30, - "h": 30 + "x": 12, + "y": 10, + "w": 16, + "h": 18 }, "frame": { - "x": 160, + "x": 94, "y": 0, - "w": 30, - "h": 30 + "w": 16, + "h": 18 } }, { @@ -144,16 +144,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 + "x": 13, + "y": 9, + "w": 14, + "h": 18 }, "frame": { - "x": 190, + "x": 110, "y": 0, - "w": 16, - "h": 20 + "w": 14, + "h": 18 } }, { @@ -165,125 +165,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 190, - "y": 20, - "w": 16, - "h": 20 - } - }, - { - "filename": "212-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 30, - "h": 30 - }, - "frame": { - "x": 0, - "y": 30, - "w": 30, - "h": 30 - } - }, - { - "filename": "181-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 31, - "h": 28 - }, - "frame": { - "x": 30, - "y": 30, - "w": 31, - "h": 28 - } - }, - { - "filename": "181-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 31, - "h": 28 - }, - "frame": { - "x": 61, - "y": 30, - "w": 31, - "h": 28 - } - }, - { - "filename": "243_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 32, - "h": 27 - }, - "frame": { - "x": 92, - "y": 30, - "w": 32, - "h": 27 - } - }, - { - "filename": "243_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 32, - "h": 27 + "x": 13, + "y": 9, + "w": 14, + "h": 18 }, "frame": { "x": 124, - "y": 30, - "w": 32, - "h": 27 + "y": 0, + "w": 14, + "h": 18 } }, { - "filename": "245_2", + "filename": "200_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 138, + "y": 0, + "w": 16, + "h": 19 + } + }, + { + "filename": "200_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 154, + "y": 0, + "w": 16, + "h": 19 + } + }, + { + "filename": "200_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 170, + "y": 0, + "w": 16, + "h": 19 + } + }, + { + "filename": "226_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -292,15 +250,204 @@ }, "spriteSourceSize": { "x": 5, - "y": 2, - "w": 31, - "h": 27 + "y": 9, + "w": 30, + "h": 19 }, "frame": { - "x": 156, - "y": 30, - "w": 31, - "h": 27 + "x": 186, + "y": 0, + "w": 30, + "h": 19 + } + }, + { + "filename": "226_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 9, + "w": 30, + "h": 19 + }, + "frame": { + "x": 216, + "y": 0, + "w": 30, + "h": 19 + } + }, + { + "filename": "216_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 0, + "y": 16, + "w": 16, + "h": 20 + } + }, + { + "filename": "179_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 16, + "y": 17, + "w": 22, + "h": 20 + } + }, + { + "filename": "179_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 38, + "y": 17, + "w": 22, + "h": 20 + } + }, + { + "filename": "216_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 60, + "y": 18, + "w": 16, + "h": 20 + } + }, + { + "filename": "216_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 76, + "y": 18, + "w": 16, + "h": 20 + } + }, + { + "filename": "239_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 92, + "y": 18, + "w": 21, + "h": 20 + } + }, + { + "filename": "239_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 113, + "y": 18, + "w": 21, + "h": 20 + } + }, + { + "filename": "239_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 134, + "y": 19, + "w": 21, + "h": 20 } }, { @@ -312,142 +459,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 187, - "y": 40, - "w": 19, - "h": 23 - } - }, - { - "filename": "245_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 31, - "h": 27 - }, - "frame": { - "x": 92, - "y": 57, - "w": 31, - "h": 27 - } - }, - { - "filename": "212_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 28, - "h": 29 - }, - "frame": { - "x": 30, - "y": 58, - "w": 28, - "h": 29 - } - }, - { - "filename": "212_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 28, - "h": 29 - }, - "frame": { - "x": 0, - "y": 60, - "w": 28, - "h": 29 - } - }, - { - "filename": "212_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 28, - "h": 29 - }, - "frame": { - "x": 58, - "y": 58, - "w": 28, - "h": 29 - } - }, - { - "filename": "169_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 32, - "h": 25 - }, - "frame": { - "x": 123, - "y": 57, - "w": 32, - "h": 25 - } - }, - { - "filename": "169_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 32, - "h": 25 + "x": 11, + "y": 7, + "w": 17, + "h": 21 }, "frame": { "x": 155, - "y": 57, - "w": 32, - "h": 25 + "y": 19, + "w": 17, + "h": 21 } }, { @@ -458,16 +479,289 @@ "w": 40, "h": 30 }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 172, + "y": 19, + "w": 17, + "h": 21 + } + }, + { + "filename": "176_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 189, + "y": 19, + "w": 17, + "h": 21 + } + }, + { + "filename": "196_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 206, + "y": 19, + "w": 27, + "h": 21 + } + }, + { + "filename": "197_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 233, + "y": 19, + "w": 20, + "h": 21 + } + }, + { + "filename": "196_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 0, + "y": 37, + "w": 27, + "h": 21 + } + }, + { + "filename": "196_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 27, + "y": 37, + "w": 27, + "h": 21 + } + }, + { + "filename": "197_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 54, + "y": 38, + "w": 20, + "h": 21 + } + }, + { + "filename": "180_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, "spriteSourceSize": { "x": 10, "y": 6, - "w": 19, + "w": 21, + "h": 22 + }, + "frame": { + "x": 74, + "y": 38, + "w": 21, + "h": 22 + } + }, + { + "filename": "180_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 95, + "y": 38, + "w": 21, + "h": 22 + } + }, + { + "filename": "242_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 116, + "y": 39, + "w": 22, + "h": 22 + } + }, + { + "filename": "242_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 138, + "y": 40, + "w": 22, + "h": 22 + } + }, + { + "filename": "242_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 160, + "y": 40, + "w": 22, + "h": 22 + } + }, + { + "filename": "169_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 30, "h": 23 }, "frame": { - "x": 187, - "y": 63, - "w": 19, + "x": 182, + "y": 40, + "w": 30, + "h": 23 + } + }, + { + "filename": "169_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 30, + "h": 23 + }, + "frame": { + "x": 212, + "y": 40, + "w": 30, "h": 23 } }, @@ -480,15 +774,99 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, + "y": 6, + "w": 30, + "h": 23 + }, + "frame": { + "x": 0, + "y": 58, + "w": 30, + "h": 23 + } + }, + { + "filename": "217_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 5, - "w": 32, + "w": 21, + "h": 23 + }, + "frame": { + "x": 30, + "y": 58, + "w": 21, + "h": 23 + } + }, + { + "filename": "217_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 51, + "y": 59, + "w": 21, + "h": 23 + } + }, + { + "filename": "217_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 72, + "y": 60, + "w": 21, + "h": 23 + } + }, + { + "filename": "181_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 20, "h": 25 }, "frame": { - "x": 123, - "y": 82, - "w": 32, + "x": 93, + "y": 60, + "w": 20, "h": 25 } }, @@ -501,37 +879,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 27, - "h": 26 + "x": 8, + "y": 4, + "w": 25, + "h": 24 }, "frame": { - "x": 155, - "y": 82, - "w": 27, - "h": 26 - } - }, - { - "filename": "181_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 27 - }, - "frame": { - "x": 182, - "y": 86, - "w": 22, - "h": 27 + "x": 113, + "y": 61, + "w": 25, + "h": 24 } }, { @@ -543,16 +900,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 27, - "h": 26 + "x": 8, + "y": 4, + "w": 25, + "h": 24 }, "frame": { - "x": 86, - "y": 84, - "w": 27, - "h": 26 + "x": 138, + "y": 62, + "w": 25, + "h": 24 } }, { @@ -564,16 +921,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 27, - "h": 26 + "x": 8, + "y": 4, + "w": 25, + "h": 24 }, "frame": { - "x": 113, - "y": 107, - "w": 27, - "h": 26 + "x": 163, + "y": 63, + "w": 25, + "h": 24 } }, { @@ -585,58 +942,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 27, - "h": 26 + "x": 8, + "y": 4, + "w": 25, + "h": 24 }, "frame": { - "x": 140, - "y": 108, - "w": 27, - "h": 26 - } - }, - { - "filename": "226_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 32, - "h": 21 - }, - "frame": { - "x": 167, - "y": 113, - "w": 32, - "h": 21 - } - }, - { - "filename": "226_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 32, - "h": 21 - }, - "frame": { - "x": 28, - "y": 87, - "w": 32, - "h": 21 + "x": 188, + "y": 63, + "w": 25, + "h": 24 } }, { @@ -648,20 +963,167 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 27 + "x": 11, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 213, + "y": 63, + "w": 20, + "h": 25 + } + }, + { + "filename": "243_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 25 + }, + "frame": { + "x": 0, + "y": 81, + "w": 30, + "h": 25 + } + }, + { + "filename": "243_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 25 + }, + "frame": { + "x": 30, + "y": 82, + "w": 30, + "h": 25 + } + }, + { + "filename": "245_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 29, + "h": 25 }, "frame": { "x": 60, + "y": 83, + "w": 29, + "h": 25 + } + }, + { + "filename": "245_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 89, + "y": 85, + "w": 29, + "h": 25 + } + }, + { + "filename": "181-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 29, + "h": 26 + }, + "frame": { + "x": 118, + "y": 86, + "w": 29, + "h": 26 + } + }, + { + "filename": "181-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 29, + "h": 26 + }, + "frame": { + "x": 147, "y": 87, - "w": 22, + "w": 29, + "h": 26 + } + }, + { + "filename": "212_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 176, + "y": 87, + "w": 26, "h": 27 } }, { - "filename": "196_1", + "filename": "212_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -670,19 +1132,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 6, - "w": 29, - "h": 23 + "y": 1, + "w": 26, + "h": 27 }, "frame": { - "x": 82, - "y": 110, - "w": 29, - "h": 23 + "x": 202, + "y": 88, + "w": 26, + "h": 27 } }, { - "filename": "242_1", + "filename": "212_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -690,20 +1152,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 24, - "h": 24 + "x": 6, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 228, + "y": 88, + "w": 26, + "h": 27 + } + }, + { + "filename": "212-mega_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 28, + "h": 28 }, "frame": { "x": 0, - "y": 89, - "w": 24, - "h": 24 + "y": 106, + "w": 28, + "h": 28 } }, { - "filename": "196_2", + "filename": "212-mega_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -711,20 +1194,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 29, - "h": 23 + "x": 4, + "y": 1, + "w": 28, + "h": 28 }, "frame": { - "x": 24, + "x": 28, + "y": 107, + "w": 28, + "h": 28 + } + }, + { + "filename": "212-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 56, "y": 108, - "w": 29, - "h": 23 + "w": 28, + "h": 28 } }, { - "filename": "242_2", + "filename": "249_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -732,20 +1236,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 24, - "h": 24 + "x": 4, + "y": 0, + "w": 32, + "h": 29 }, "frame": { - "x": 0, - "y": 113, - "w": 24, - "h": 24 + "x": 84, + "y": 110, + "w": 32, + "h": 29 } }, { - "filename": "196_3", + "filename": "249_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 32, + "h": 29 + }, + "frame": { + "x": 116, + "y": 113, + "w": 32, + "h": 29 + } + }, + { + "filename": "250_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -754,19 +1279,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 6, + "y": 0, "w": 29, - "h": 23 + "h": 30 }, "frame": { - "x": 53, + "x": 148, "y": 114, "w": 29, - "h": 23 + "h": 30 } }, { - "filename": "242_3", + "filename": "250_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -774,520 +1299,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 24, - "y": 131, - "w": 24, - "h": 24 - } - }, - { - "filename": "217_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, + "x": 6, + "y": 0, + "w": 29, "h": 30 }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 25 - }, "frame": { - "x": 0, - "y": 137, - "w": 23, - "h": 25 - } - }, - { - "filename": "217_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, + "x": 177, + "y": 115, + "w": 29, "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 82, - "y": 133, - "w": 23, - "h": 25 - } - }, - { - "filename": "217_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 48, - "y": 137, - "w": 23, - "h": 25 - } - }, - { - "filename": "180_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 23, - "y": 155, - "w": 23, - "h": 24 - } - }, - { - "filename": "180_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 0, - "y": 162, - "w": 23, - "h": 24 - } - }, - { - "filename": "179_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 105, - "y": 133, - "w": 24, - "h": 22 - } - }, - { - "filename": "183_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 0, - "y": 186, - "w": 25, - "h": 19 - } - }, - { - "filename": "179_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 25, - "y": 179, - "w": 24, - "h": 22 - } - }, - { - "filename": "197_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 105, - "y": 155, - "w": 22, - "h": 23 - } - }, - { - "filename": "239_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 71, - "y": 158, - "w": 23, - "h": 22 - } - }, - { - "filename": "197_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 49, - "y": 162, - "w": 22, - "h": 23 - } - }, - { - "filename": "239_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 94, - "y": 178, - "w": 23, - "h": 22 - } - }, - { - "filename": "239_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 71, - "y": 180, - "w": 23, - "h": 22 - } - }, - { - "filename": "200_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 49, - "y": 185, - "w": 18, - "h": 21 - } - }, - { - "filename": "183_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 117, - "y": 178, - "w": 25, - "h": 19 - } - }, - { - "filename": "176_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 127, - "y": 155, - "w": 19, - "h": 23 - } - }, - { - "filename": "200_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 129, - "y": 134, - "w": 18, - "h": 21 - } - }, - { - "filename": "216_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 18, - "h": 22 - }, - "frame": { - "x": 142, - "y": 178, - "w": 18, - "h": 22 - } - }, - { - "filename": "216_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 18, - "h": 22 - }, - "frame": { - "x": 146, - "y": 155, - "w": 18, - "h": 22 - } - }, - { - "filename": "200_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 147, - "y": 134, - "w": 18, - "h": 21 - } - }, - { - "filename": "175_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 20 - }, - "frame": { - "x": 160, - "y": 177, - "w": 18, - "h": 20 - } - }, - { - "filename": "175_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 20 - }, - "frame": { - "x": 164, - "y": 155, - "w": 18, - "h": 20 - } - }, - { - "filename": "175_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 20 - }, - "frame": { - "x": 165, - "y": 134, - "w": 18, - "h": 20 - } - }, - { - "filename": "173_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 18, - "h": 18 - }, - "frame": { - "x": 178, - "y": 175, - "w": 18, - "h": 18 } } ] @@ -1296,6 +1317,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8c18a6ddb606237429d62c72522bbacf:e3a0b4ceda717c5f427ac78732307f42:63b368599cdc6e139499267117e91cd5$" + "smartupdate": "$TexturePacker:SmartUpdate:4e313ecdb49d32f2e16b49413881dff5:05c9b62059ccf62c4e50f1fb9655e525:63b368599cdc6e139499267117e91cd5$" } } diff --git a/public/images/pokemon_icons_2v.png b/public/images/pokemon_icons_2v.png index 72535e2f822..8bf5914cfd9 100644 Binary files a/public/images/pokemon_icons_2v.png and b/public/images/pokemon_icons_2v.png differ diff --git a/public/images/pokemon_icons_3v.json b/public/images/pokemon_icons_3v.json index 7082b75c4ad..c523104dc10 100644 --- a/public/images/pokemon_icons_3v.json +++ b/public/images/pokemon_icons_3v.json @@ -4,13 +4,13 @@ "image": "pokemon_icons_3v.png", "format": "RGBA8888", "size": { - "w": 313, - "h": 313 + "w": 255, + "h": 309 }, "scale": 1, "frames": [ { - "filename": "384-mega_2", + "filename": "304_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -18,20 +18,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 40, - "h": 27 + "x": 12, + "y": 16, + "w": 16, + "h": 12 }, "frame": { "x": 0, "y": 0, - "w": 40, - "h": 27 + "w": 16, + "h": 12 } }, { - "filename": "384-mega_3", + "filename": "304_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -39,41 +39,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 0, - "y": 2, - "w": 40, - "h": 27 + "x": 12, + "y": 16, + "w": 16, + "h": 12 }, "frame": { - "x": 0, - "y": 27, - "w": 40, - "h": 27 - } - }, - { - "filename": "373-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 27 - }, - "frame": { - "x": 40, + "x": 16, "y": 0, - "w": 37, - "h": 27 + "w": 16, + "h": 12 } }, { - "filename": "373-mega_3", + "filename": "304_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -81,20 +60,251 @@ "h": 30 }, "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 37, - "h": 27 + "x": 12, + "y": 16, + "w": 16, + "h": 12 + }, + "frame": { + "x": 32, + "y": 0, + "w": 16, + "h": 12 + } + }, + { + "filename": "339_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 14, + "w": 21, + "h": 13 + }, + "frame": { + "x": 48, + "y": 0, + "w": 21, + "h": 13 + } + }, + { + "filename": "339_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 14, + "w": 21, + "h": 13 + }, + "frame": { + "x": 69, + "y": 0, + "w": 21, + "h": 13 + } + }, + { + "filename": "290_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 23, + "h": 14 + }, + "frame": { + "x": 90, + "y": 0, + "w": 23, + "h": 14 + } + }, + { + "filename": "290_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 23, + "h": 14 + }, + "frame": { + "x": 113, + "y": 0, + "w": 23, + "h": 14 + } + }, + { + "filename": "290_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 23, + "h": 14 + }, + "frame": { + "x": 136, + "y": 0, + "w": 23, + "h": 14 + } + }, + { + "filename": "285_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 18, + "h": 15 + }, + "frame": { + "x": 159, + "y": 0, + "w": 18, + "h": 15 + } + }, + { + "filename": "285_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 18, + "h": 15 + }, + "frame": { + "x": 177, + "y": 0, + "w": 18, + "h": 15 + } + }, + { + "filename": "309_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 19, + "h": 15 + }, + "frame": { + "x": 195, + "y": 0, + "w": 19, + "h": 15 + } + }, + { + "filename": "309_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 19, + "h": 15 + }, + "frame": { + "x": 214, + "y": 0, + "w": 19, + "h": 15 + } + }, + { + "filename": "263_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 22, + "h": 16 + }, + "frame": { + "x": 233, + "y": 0, + "w": 22, + "h": 16 + } + }, + { + "filename": "263_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 22, + "h": 16 }, "frame": { "x": 0, - "y": 54, - "w": 37, - "h": 27 + "y": 12, + "w": 22, + "h": 16 } }, { - "filename": "383-primal_2", + "filename": "333_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -102,20 +312,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 26 + "x": 10, + "y": 11, + "w": 19, + "h": 16 }, "frame": { - "x": 77, - "y": 0, - "w": 38, - "h": 26 + "x": 22, + "y": 12, + "w": 19, + "h": 16 } }, { - "filename": "383-primal_3", + "filename": "333_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -123,20 +333,398 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 3, - "w": 38, - "h": 26 + "x": 10, + "y": 11, + "w": 19, + "h": 16 + }, + "frame": { + "x": 41, + "y": 13, + "w": 19, + "h": 16 + } + }, + { + "filename": "305_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 60, + "y": 13, + "w": 23, + "h": 17 + } + }, + { + "filename": "305_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 83, + "y": 14, + "w": 23, + "h": 17 + } + }, + { + "filename": "305_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 106, + "y": 14, + "w": 23, + "h": 17 + } + }, + { + "filename": "374_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 19, + "h": 17 + }, + "frame": { + "x": 129, + "y": 14, + "w": 19, + "h": 17 + } + }, + { + "filename": "374_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 19, + "h": 17 + }, + "frame": { + "x": 148, + "y": 15, + "w": 19, + "h": 17 + } + }, + { + "filename": "280_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 167, + "y": 15, + "w": 14, + "h": 18 + } + }, + { + "filename": "280_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 181, + "y": 15, + "w": 14, + "h": 18 + } + }, + { + "filename": "292_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 195, + "y": 15, + "w": 20, + "h": 19 + } + }, + { + "filename": "298_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 215, + "y": 15, + "w": 15, + "h": 19 + } + }, + { + "filename": "292_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 230, + "y": 16, + "w": 20, + "h": 19 + } + }, + { + "filename": "292_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 0, + "y": 28, + "w": 20, + "h": 19 + } + }, + { + "filename": "298_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 20, + "y": 28, + "w": 15, + "h": 19 + } + }, + { + "filename": "311_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 35, + "y": 29, + "w": 16, + "h": 19 + } + }, + { + "filename": "311_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 51, + "y": 30, + "w": 16, + "h": 19 + } + }, + { + "filename": "311_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 67, + "y": 30, + "w": 16, + "h": 19 + } + }, + { + "filename": "312_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 83, + "y": 31, + "w": 16, + "h": 19 + } + }, + { + "filename": "312_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 99, + "y": 31, + "w": 16, + "h": 19 + } + }, + { + "filename": "328_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 }, "frame": { "x": 115, - "y": 0, - "w": 38, - "h": 26 + "y": 31, + "w": 19, + "h": 19 } }, { - "filename": "380-mega_2", + "filename": "328_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -144,20 +732,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 26 + "x": 11, + "y": 9, + "w": 19, + "h": 19 }, "frame": { - "x": 40, - "y": 27, - "w": 37, - "h": 26 + "x": 134, + "y": 32, + "w": 19, + "h": 19 } }, { - "filename": "380-mega_3", + "filename": "340_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -165,62 +753,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 26 - }, - "frame": { - "x": 0, - "y": 81, - "w": 37, - "h": 26 - } - }, - { - "filename": "381-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 26 - }, - "frame": { - "x": 77, - "y": 26, - "w": 37, - "h": 26 - } - }, - { - "filename": "381-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 37, - "h": 26 + "x": 9, + "y": 10, + "w": 24, + "h": 19 }, "frame": { "x": 153, - "y": 0, - "w": 37, - "h": 26 + "y": 33, + "w": 24, + "h": 19 } }, { - "filename": "384_2", + "filename": "307_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -228,20 +774,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 33, - "h": 29 + "x": 11, + "y": 8, + "w": 17, + "h": 20 }, "frame": { - "x": 0, - "y": 107, - "w": 33, - "h": 29 + "x": 177, + "y": 33, + "w": 17, + "h": 20 } }, { - "filename": "384_3", + "filename": "340_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -249,20 +795,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 33, - "h": 29 + "x": 9, + "y": 10, + "w": 24, + "h": 19 }, "frame": { - "x": 0, - "y": 136, - "w": 33, - "h": 29 + "x": 194, + "y": 34, + "w": 24, + "h": 19 } }, { - "filename": "306-mega_1", + "filename": "264_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -270,205 +816,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 33, - "h": 28 + "x": 9, + "y": 8, + "w": 22, + "h": 20 }, "frame": { - "x": 0, - "y": 165, - "w": 33, - "h": 28 - } - }, - { - "filename": "306-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 33, - "h": 28 - }, - "frame": { - "x": 0, - "y": 193, - "w": 33, - "h": 28 - } - }, - { - "filename": "306-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 33, - "h": 28 - }, - "frame": { - "x": 0, - "y": 221, - "w": 33, - "h": 28 - } - }, - { - "filename": "382-primal_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 38, - "h": 23 - }, - "frame": { - "x": 114, - "y": 26, - "w": 38, - "h": 23 - } - }, - { - "filename": "382-primal_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 38, - "h": 23 - }, - "frame": { - "x": 190, - "y": 0, - "w": 38, - "h": 23 - } - }, - { - "filename": "303-mega_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 249, - "w": 32, - "h": 28 - } - }, - { - "filename": "303-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 277, - "w": 32, - "h": 28 - } - }, - { - "filename": "382_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 35, - "h": 23 - }, - "frame": { - "x": 152, - "y": 26, - "w": 35, - "h": 23 - } - }, - { - "filename": "382_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 35, - "h": 23 - }, - "frame": { - "x": 228, - "y": 0, - "w": 35, - "h": 23 - } - }, - { - "filename": "383_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 35, - "h": 26 - }, - "frame": { - "x": 263, - "y": 0, - "w": 35, - "h": 26 + "x": 218, + "y": 35, + "w": 22, + "h": 20 } }, { @@ -480,16 +837,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 15, - "h": 22 + "x": 13, + "y": 8, + "w": 13, + "h": 20 }, "frame": { - "x": 298, - "y": 0, - "w": 15, - "h": 22 + "x": 240, + "y": 35, + "w": 13, + "h": 20 + } + }, + { + "filename": "264_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 0, + "y": 47, + "w": 22, + "h": 20 } }, { @@ -501,20 +879,881 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 7, + "x": 13, + "y": 8, + "w": 13, + "h": 20 + }, + "frame": { + "x": 22, + "y": 47, + "w": 13, + "h": 20 + } + }, + { + "filename": "371_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, "w": 15, + "h": 20 + }, + "frame": { + "x": 35, + "y": 48, + "w": 15, + "h": 20 + } + }, + { + "filename": "291_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 50, + "y": 49, + "w": 23, + "h": 20 + } + }, + { + "filename": "291_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 73, + "y": 50, + "w": 23, + "h": 20 + } + }, + { + "filename": "291_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 96, + "y": 50, + "w": 23, + "h": 20 + } + }, + { + "filename": "371_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 20 + }, + "frame": { + "x": 119, + "y": 50, + "w": 15, + "h": 20 + } + }, + { + "filename": "307_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 134, + "y": 51, + "w": 17, + "h": 20 + } + }, + { + "filename": "300_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 151, + "y": 52, + "w": 20, + "h": 20 + } + }, + { + "filename": "300_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 171, + "y": 53, + "w": 20, + "h": 20 + } + }, + { + "filename": "300_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 191, + "y": 53, + "w": 20, + "h": 20 + } + }, + { + "filename": "329_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 25, + "h": 20 + }, + "frame": { + "x": 211, + "y": 55, + "w": 25, + "h": 20 + } + }, + { + "filename": "351-sunny_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 236, + "y": 55, + "w": 18, + "h": 20 + } + }, + { + "filename": "329_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 25, + "h": 20 + }, + "frame": { + "x": 0, + "y": 67, + "w": 25, + "h": 20 + } + }, + { + "filename": "336_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 25, + "y": 68, + "w": 23, + "h": 20 + } + }, + { + "filename": "336_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 23, + "h": 20 + }, + "frame": { + "x": 48, + "y": 69, + "w": 23, + "h": 20 + } + }, + { + "filename": "351-sunny_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 71, + "y": 70, + "w": 18, + "h": 20 + } + }, + { + "filename": "351-sunny_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 89, + "y": 70, + "w": 18, + "h": 20 + } + }, + { + "filename": "352_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 107, + "y": 70, + "w": 20, + "h": 20 + } + }, + { + "filename": "352_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 127, + "y": 71, + "w": 20, + "h": 20 + } + }, + { + "filename": "352_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 147, + "y": 72, + "w": 20, + "h": 20 + } + }, + { + "filename": "385_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 167, + "y": 73, + "w": 22, + "h": 20 + } + }, + { + "filename": "385_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 189, + "y": 73, + "w": 22, + "h": 20 + } + }, + { + "filename": "385_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 211, + "y": 75, + "w": 22, + "h": 20 + } + }, + { + "filename": "301_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 233, + "y": 75, + "w": 22, + "h": 21 + } + }, + { + "filename": "301_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 0, + "y": 87, + "w": 22, + "h": 21 + } + }, + { + "filename": "301_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 22, + "y": 88, + "w": 22, + "h": 21 + } + }, + { + "filename": "303_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 26, + "h": 21 + }, + "frame": { + "x": 44, + "y": 89, + "w": 26, + "h": 21 + } + }, + { + "filename": "303_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 26, + "h": 21 + }, + "frame": { + "x": 70, + "y": 90, + "w": 26, + "h": 21 + } + }, + { + "filename": "351-rainy_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 96, + "y": 90, + "w": 14, + "h": 21 + } + }, + { + "filename": "351-rainy_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 110, + "y": 90, + "w": 14, + "h": 21 + } + }, + { + "filename": "351-rainy_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 124, + "y": 91, + "w": 14, + "h": 21 + } + }, + { + "filename": "358_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 21 + }, + "frame": { + "x": 138, + "y": 92, + "w": 15, + "h": 21 + } + }, + { + "filename": "358_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 21 + }, + "frame": { + "x": 153, + "y": 93, + "w": 15, + "h": 21 + } + }, + { + "filename": "358_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 15, + "h": 21 + }, + "frame": { + "x": 168, + "y": 93, + "w": 15, + "h": 21 + } + }, + { + "filename": "372_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 183, + "y": 93, + "w": 20, + "h": 21 + } + }, + { + "filename": "372_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 203, + "y": 95, + "w": 20, + "h": 21 + } + }, + { + "filename": "380_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 27, + "h": 21 + }, + "frame": { + "x": 223, + "y": 96, + "w": 27, + "h": 21 + } + }, + { + "filename": "338_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, "h": 22 }, "frame": { - "x": 298, - "y": 22, - "w": 15, + "x": 0, + "y": 108, + "w": 21, "h": 22 } }, { - "filename": "383_3", + "filename": "335_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 21, + "y": 109, + "w": 23, + "h": 22 + } + }, + { + "filename": "335_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 44, + "y": 110, + "w": 23, + "h": 22 + } + }, + { + "filename": "380_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 27, + "h": 21 + }, + "frame": { + "x": 67, + "y": 111, + "w": 27, + "h": 21 + } + }, + { + "filename": "338_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 94, + "y": 111, + "w": 21, + "h": 22 + } + }, + { + "filename": "382-primal_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -523,19 +1762,19 @@ }, "spriteSourceSize": { "x": 3, - "y": 3, - "w": 35, - "h": 26 + "y": 8, + "w": 36, + "h": 21 }, "frame": { - "x": 114, - "y": 49, - "w": 35, - "h": 26 + "x": 115, + "y": 113, + "w": 36, + "h": 21 } }, { - "filename": "376-mega_2", + "filename": "382-primal_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -543,16 +1782,373 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 34, - "h": 26 + "x": 3, + "y": 8, + "w": 36, + "h": 21 }, "frame": { - "x": 149, - "y": 49, - "w": 34, - "h": 26 + "x": 151, + "y": 114, + "w": 36, + "h": 21 + } + }, + { + "filename": "382_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 33, + "h": 21 + }, + "frame": { + "x": 187, + "y": 116, + "w": 33, + "h": 21 + } + }, + { + "filename": "382_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 33, + "h": 21 + }, + "frame": { + "x": 220, + "y": 117, + "w": 33, + "h": 21 + } + }, + { + "filename": "281_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 18, + "h": 23 + }, + "frame": { + "x": 0, + "y": 130, + "w": 18, + "h": 23 + } + }, + { + "filename": "281_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 18, + "h": 23 + }, + "frame": { + "x": 18, + "y": 131, + "w": 18, + "h": 23 + } + }, + { + "filename": "375_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 27, + "h": 22 + }, + "frame": { + "x": 36, + "y": 132, + "w": 27, + "h": 22 + } + }, + { + "filename": "375_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 8, + "w": 27, + "h": 22 + }, + "frame": { + "x": 63, + "y": 132, + "w": 27, + "h": 22 + } + }, + { + "filename": "310_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 90, + "y": 133, + "w": 20, + "h": 23 + } + }, + { + "filename": "381_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 22 + }, + "frame": { + "x": 110, + "y": 134, + "w": 28, + "h": 22 + } + }, + { + "filename": "381_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 22 + }, + "frame": { + "x": 138, + "y": 135, + "w": 28, + "h": 22 + } + }, + { + "filename": "310_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 166, + "y": 135, + "w": 20, + "h": 23 + } + }, + { + "filename": "330_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 186, + "y": 137, + "w": 27, + "h": 23 + } + }, + { + "filename": "330_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 213, + "y": 138, + "w": 27, + "h": 23 + } + }, + { + "filename": "351-snowy_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 0, + "y": 153, + "w": 17, + "h": 23 + } + }, + { + "filename": "334-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 17, + "y": 154, + "w": 27, + "h": 23 + } + }, + { + "filename": "334-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 44, + "y": 154, + "w": 27, + "h": 23 + } + }, + { + "filename": "351-snowy_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 71, + "y": 154, + "w": 17, + "h": 23 + } + }, + { + "filename": "351-snowy_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 88, + "y": 156, + "w": 17, + "h": 23 } }, { @@ -564,16 +2160,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 34, - "h": 25 + "x": 4, + "y": 5, + "w": 32, + "h": 23 }, "frame": { - "x": 190, - "y": 23, - "w": 34, - "h": 25 + "x": 105, + "y": 156, + "w": 32, + "h": 23 + } + }, + { + "filename": "282-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 137, + "y": 157, + "w": 26, + "h": 24 + } + }, + { + "filename": "334_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 163, + "y": 158, + "w": 20, + "h": 24 + } + }, + { + "filename": "282-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 183, + "y": 160, + "w": 26, + "h": 24 } }, { @@ -585,15 +2244,330 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, + "x": 4, + "y": 5, + "w": 32, + "h": 23 + }, + "frame": { + "x": 209, + "y": 161, + "w": 32, + "h": 23 + } + }, + { + "filename": "376_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 32, + "h": 23 + }, + "frame": { + "x": 0, + "y": 177, + "w": 32, + "h": 23 + } + }, + { + "filename": "376_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 32, + "h": 23 + }, + "frame": { + "x": 32, + "y": 177, + "w": 32, + "h": 23 + } + }, + { + "filename": "334_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 4, - "w": 34, + "w": 20, + "h": 24 + }, + "frame": { + "x": 64, + "y": 177, + "w": 20, + "h": 24 + } + }, + { + "filename": "282_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 84, + "y": 179, + "w": 26, + "h": 24 + } + }, + { + "filename": "282_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 110, + "y": 179, + "w": 26, + "h": 24 + } + }, + { + "filename": "310-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 24 + }, + "frame": { + "x": 136, + "y": 181, + "w": 26, + "h": 24 + } + }, + { + "filename": "308_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 17, "h": 25 }, "frame": { - "x": 224, - "y": 23, - "w": 34, + "x": 162, + "y": 182, + "w": 17, + "h": 25 + } + }, + { + "filename": "306_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 29, + "h": 24 + }, + "frame": { + "x": 179, + "y": 184, + "w": 29, + "h": 24 + } + }, + { + "filename": "306_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 29, + "h": 24 + }, + "frame": { + "x": 208, + "y": 184, + "w": 29, + "h": 24 + } + }, + { + "filename": "308_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 17, + "h": 25 + }, + "frame": { + "x": 237, + "y": 184, + "w": 17, + "h": 25 + } + }, + { + "filename": "306_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 29, + "h": 24 + }, + "frame": { + "x": 0, + "y": 200, + "w": 29, + "h": 24 + } + }, + { + "filename": "310-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 24 + }, + "frame": { + "x": 29, + "y": 200, + "w": 26, + "h": 24 + } + }, + { + "filename": "286_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 55, + "y": 201, + "w": 23, + "h": 25 + } + }, + { + "filename": "376-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 5, + "w": 32, + "h": 24 + }, + "frame": { + "x": 78, + "y": 203, + "w": 32, + "h": 24 + } + }, + { + "filename": "286_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 110, + "y": 203, + "w": 23, "h": 25 } }, @@ -606,41 +2580,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 34, - "h": 26 + "x": 3, + "y": 5, + "w": 32, + "h": 24 }, "frame": { - "x": 258, - "y": 26, - "w": 34, - "h": 26 + "x": 133, + "y": 207, + "w": 32, + "h": 24 } }, { - "filename": "328_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 292, - "y": 44, - "w": 21, - "h": 21 - } - }, - { - "filename": "376_2", + "filename": "380-mega_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -649,17 +2602,290 @@ }, "spriteSourceSize": { "x": 4, - "y": 6, - "w": 34, + "y": 4, + "w": 35, "h": 24 }, "frame": { - "x": 40, - "y": 53, - "w": 34, + "x": 165, + "y": 208, + "w": 35, "h": 24 } }, + { + "filename": "380-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 35, + "h": 24 + }, + "frame": { + "x": 200, + "y": 208, + "w": 35, + "h": 24 + } + }, + { + "filename": "381-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 35, + "h": 24 + }, + "frame": { + "x": 0, + "y": 224, + "w": 35, + "h": 24 + } + }, + { + "filename": "381-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 35, + "h": 24 + }, + "frame": { + "x": 35, + "y": 226, + "w": 35, + "h": 24 + } + }, + { + "filename": "383-primal_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 36, + "h": 24 + }, + "frame": { + "x": 70, + "y": 227, + "w": 36, + "h": 24 + } + }, + { + "filename": "383-primal_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 4, + "w": 36, + "h": 24 + }, + "frame": { + "x": 106, + "y": 231, + "w": 36, + "h": 24 + } + }, + { + "filename": "383_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 33, + "h": 24 + }, + "frame": { + "x": 142, + "y": 232, + "w": 33, + "h": 24 + } + }, + { + "filename": "383_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 33, + "h": 24 + }, + "frame": { + "x": 175, + "y": 232, + "w": 33, + "h": 24 + } + }, + { + "filename": "373-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 35, + "h": 25 + }, + "frame": { + "x": 208, + "y": 232, + "w": 35, + "h": 25 + } + }, + { + "filename": "373-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 2, + "y": 3, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 248, + "w": 35, + "h": 25 + } + }, + { + "filename": "303-mega_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 3, + "w": 30, + "h": 26 + }, + "frame": { + "x": 35, + "y": 250, + "w": 30, + "h": 26 + } + }, + { + "filename": "384-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 3, + "w": 38, + "h": 25 + }, + "frame": { + "x": 65, + "y": 251, + "w": 38, + "h": 25 + } + }, + { + "filename": "384-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 3, + "w": 38, + "h": 25 + }, + "frame": { + "x": 103, + "y": 255, + "w": 38, + "h": 25 + } + }, + { + "filename": "303-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 3, + "w": 30, + "h": 26 + }, + "frame": { + "x": 141, + "y": 256, + "w": 30, + "h": 26 + } + }, { "filename": "303-mega_3", "rotated": false, @@ -668,42 +2894,21 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 32, - "h": 28 - }, - "frame": { - "x": 37, - "y": 77, - "w": 32, - "h": 28 - } - }, - { - "filename": "376_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 4, - "y": 6, - "w": 34, - "h": 24 + "y": 3, + "w": 30, + "h": 26 }, "frame": { - "x": 77, - "y": 52, - "w": 34, - "h": 24 + "x": 171, + "y": 256, + "w": 30, + "h": 26 } }, { - "filename": "321_2", + "filename": "306-mega_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -712,15 +2917,57 @@ }, "spriteSourceSize": { "x": 5, - "y": 4, - "w": 32, - "h": 25 + "y": 3, + "w": 31, + "h": 26 }, "frame": { - "x": 37, - "y": 105, - "w": 32, - "h": 25 + "x": 201, + "y": 257, + "w": 31, + "h": 26 + } + }, + { + "filename": "306-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 31, + "h": 26 + }, + "frame": { + "x": 0, + "y": 273, + "w": 31, + "h": 26 + } + }, + { + "filename": "306-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 31, + "h": 26 + }, + "frame": { + "x": 31, + "y": 276, + "w": 31, + "h": 26 } }, { @@ -732,16 +2979,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 31, - "h": 29 + "x": 7, + "y": 2, + "w": 29, + "h": 27 }, "frame": { - "x": 33, - "y": 130, - "w": 31, - "h": 29 + "x": 62, + "y": 276, + "w": 29, + "h": 27 } }, { @@ -753,83 +3000,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 31, - "h": 29 + "x": 7, + "y": 2, + "w": 29, + "h": 27 }, "frame": { - "x": 33, - "y": 159, - "w": 31, - "h": 29 + "x": 91, + "y": 280, + "w": 29, + "h": 27 } }, { - "filename": "306_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 31, - "h": 26 - }, - "frame": { - "x": 33, - "y": 188, - "w": 31, - "h": 26 - } - }, - { - "filename": "306_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 31, - "h": 26 - }, - "frame": { - "x": 33, - "y": 214, - "w": 31, - "h": 26 - } - }, - { - "filename": "306_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 31, - "h": 26 - }, - "frame": { - "x": 33, - "y": 240, - "w": 31, - "h": 26 - } - }, - { - "filename": "321_3", + "filename": "384_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -838,607 +3022,19 @@ }, "spriteSourceSize": { "x": 5, - "y": 4, - "w": 32, - "h": 25 - }, - "frame": { - "x": 32, - "y": 266, - "w": 32, - "h": 25 - } - }, - { - "filename": "329_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 32, - "y": 291, - "w": 27, - "h": 22 - } - }, - { - "filename": "329_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 27, - "h": 22 - }, - "frame": { - "x": 59, - "y": 291, - "w": 27, - "h": 22 - } - }, - { - "filename": "475-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 27, - "h": 28 - }, - "frame": { - "x": 69, - "y": 77, - "w": 27, - "h": 28 - } - }, - { - "filename": "282-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 69, - "y": 105, - "w": 28, - "h": 26 - } - }, - { - "filename": "282-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 64, - "y": 131, - "w": 28, - "h": 26 - } - }, - { - "filename": "282_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 64, - "y": 157, - "w": 28, - "h": 26 - } - }, - { - "filename": "282_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 64, - "y": 183, - "w": 28, - "h": 26 - } - }, - { - "filename": "310-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 26 - }, - "frame": { - "x": 64, - "y": 209, - "w": 28, - "h": 26 - } - }, - { - "filename": "310-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 26 - }, - "frame": { - "x": 64, - "y": 235, - "w": 28, - "h": 26 - } - }, - { - "filename": "330_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 64, - "y": 261, - "w": 29, - "h": 25 - } - }, - { - "filename": "286_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, "y": 2, - "w": 25, + "w": 31, "h": 27 }, - "frame": { - "x": 86, - "y": 286, - "w": 25, - "h": 27 - } - }, - { - "filename": "286_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 25, - "h": 27 - }, - "frame": { - "x": 96, - "y": 76, - "w": 25, - "h": 27 - } - }, - { - "filename": "330_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 121, - "y": 75, - "w": 29, - "h": 25 - } - }, - { - "filename": "334-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 150, - "y": 75, - "w": 29, - "h": 25 - } - }, - { - "filename": "475_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 24, - "h": 27 - }, - "frame": { - "x": 97, - "y": 103, - "w": 24, - "h": 27 - } - }, - { - "filename": "334-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 121, - "y": 100, - "w": 29, - "h": 25 - } - }, - { - "filename": "381_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 30, - "h": 24 - }, - "frame": { - "x": 150, - "y": 100, - "w": 30, - "h": 24 - } - }, - { - "filename": "375_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 29, - "h": 23 - }, - "frame": { - "x": 121, - "y": 125, - "w": 29, - "h": 23 - } - }, - { - "filename": "381_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 30, - "h": 24 - }, - "frame": { - "x": 150, - "y": 124, - "w": 30, - "h": 24 - } - }, - { - "filename": "375_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 29, - "h": 23 - }, - "frame": { - "x": 92, - "y": 131, - "w": 29, - "h": 23 - } - }, - { - "filename": "380_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 29, - "h": 23 - }, - "frame": { - "x": 92, - "y": 154, - "w": 29, - "h": 23 - } - }, - { - "filename": "380_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 29, - "h": 23 - }, - "frame": { - "x": 121, - "y": 148, - "w": 29, - "h": 23 - } - }, - { - "filename": "303_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 23 - }, - "frame": { - "x": 92, - "y": 177, - "w": 28, - "h": 23 - } - }, - { - "filename": "303_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 23 - }, - "frame": { - "x": 150, - "y": 148, - "w": 28, - "h": 23 - } - }, - { - "filename": "303_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 23 - }, - "frame": { - "x": 92, - "y": 200, - "w": 28, - "h": 23 - } - }, - { - "filename": "335_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 25, - "h": 24 - }, - "frame": { - "x": 92, - "y": 223, - "w": 25, - "h": 24 - } - }, - { - "filename": "278_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 13, - "w": 28, - "h": 16 - }, - "frame": { - "x": 121, - "y": 171, - "w": 28, - "h": 16 - } - }, - { - "filename": "335_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 25, - "h": 24 - }, "frame": { "x": 120, - "y": 187, - "w": 25, - "h": 24 + "y": 282, + "w": 31, + "h": 27 } }, { - "filename": "278_2", + "filename": "384_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1446,1886 +3042,17 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 13, - "w": 28, - "h": 16 - }, - "frame": { - "x": 149, - "y": 171, - "w": 28, - "h": 16 - } - }, - { - "filename": "279_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 145, - "y": 187, - "w": 25, - "h": 23 - } - }, - { - "filename": "278_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 13, - "w": 28, - "h": 16 - }, - "frame": { - "x": 120, - "y": 211, - "w": 28, - "h": 16 - } - }, - { - "filename": "320_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 26, - "h": 20 - }, - "frame": { - "x": 117, - "y": 227, - "w": 26, - "h": 20 - } - }, - { - "filename": "263_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 148, - "y": 210, - "w": 24, - "h": 18 - } - }, - { - "filename": "320_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 26, - "h": 20 - }, - "frame": { - "x": 143, - "y": 228, - "w": 26, - "h": 20 - } - }, - { - "filename": "279_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 93, - "y": 247, - "w": 25, - "h": 23 - } - }, - { - "filename": "290_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 25, - "h": 16 - }, - "frame": { - "x": 93, - "y": 270, - "w": 25, - "h": 16 - } - }, - { - "filename": "308_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, + "x": 5, "y": 2, - "w": 19, + "w": 31, "h": 27 }, "frame": { - "x": 111, - "y": 286, - "w": 19, + "x": 151, + "y": 282, + "w": 31, "h": 27 } - }, - { - "filename": "279_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 118, - "y": 247, - "w": 25, - "h": 23 - } - }, - { - "filename": "290_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 25, - "h": 16 - }, - "frame": { - "x": 118, - "y": 270, - "w": 25, - "h": 16 - } - }, - { - "filename": "308_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 19, - "h": 27 - }, - "frame": { - "x": 130, - "y": 286, - "w": 19, - "h": 27 - } - }, - { - "filename": "334_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 26 - }, - "frame": { - "x": 143, - "y": 248, - "w": 22, - "h": 26 - } - }, - { - "filename": "301_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 23 - }, - "frame": { - "x": 170, - "y": 187, - "w": 24, - "h": 23 - } - }, - { - "filename": "263_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 172, - "y": 210, - "w": 24, - "h": 18 - } - }, - { - "filename": "340_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 26, - "h": 21 - }, - "frame": { - "x": 169, - "y": 228, - "w": 26, - "h": 21 - } - }, - { - "filename": "291_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 22 - }, - "frame": { - "x": 165, - "y": 249, - "w": 25, - "h": 22 - } - }, - { - "filename": "290_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 25, - "h": 16 - }, - "frame": { - "x": 177, - "y": 171, - "w": 25, - "h": 16 - } - }, - { - "filename": "301_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 23 - }, - "frame": { - "x": 178, - "y": 148, - "w": 24, - "h": 23 - } - }, - { - "filename": "301_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 23 - }, - "frame": { - "x": 194, - "y": 187, - "w": 24, - "h": 23 - } - }, - { - "filename": "264_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 196, - "y": 210, - "w": 24, - "h": 22 - } - }, - { - "filename": "291_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 22 - }, - "frame": { - "x": 195, - "y": 232, - "w": 25, - "h": 22 - } - }, - { - "filename": "340_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 26, - "h": 21 - }, - "frame": { - "x": 190, - "y": 254, - "w": 26, - "h": 21 - } - }, - { - "filename": "291_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 22 - }, - "frame": { - "x": 165, - "y": 271, - "w": 25, - "h": 22 - } - }, - { - "filename": "351-rainy_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 149, - "y": 274, - "w": 16, - "h": 23 - } - }, - { - "filename": "305_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 190, - "y": 275, - "w": 25, - "h": 19 - } - }, - { - "filename": "280_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 16, - "h": 20 - }, - "frame": { - "x": 165, - "y": 293, - "w": 16, - "h": 20 - } - }, - { - "filename": "305_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 181, - "y": 294, - "w": 25, - "h": 19 - } - }, - { - "filename": "305_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 206, - "y": 294, - "w": 25, - "h": 19 - } - }, - { - "filename": "374_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 21, - "h": 19 - }, - "frame": { - "x": 215, - "y": 275, - "w": 21, - "h": 19 - } - }, - { - "filename": "292_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 216, - "y": 254, - "w": 22, - "h": 21 - } - }, - { - "filename": "374_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 21, - "h": 19 - }, - "frame": { - "x": 231, - "y": 294, - "w": 21, - "h": 19 - } - }, - { - "filename": "281_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 20, - "h": 25 - }, - "frame": { - "x": 179, - "y": 75, - "w": 20, - "h": 25 - } - }, - { - "filename": "334_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 26 - }, - "frame": { - "x": 183, - "y": 49, - "w": 22, - "h": 26 - } - }, - { - "filename": "310_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 205, - "y": 48, - "w": 22, - "h": 25 - } - }, - { - "filename": "310_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 25 - }, - "frame": { - "x": 227, - "y": 48, - "w": 22, - "h": 25 - } - }, - { - "filename": "281_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 20, - "h": 25 - }, - "frame": { - "x": 180, - "y": 100, - "w": 20, - "h": 25 - } - }, - { - "filename": "372_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 180, - "y": 125, - "w": 22, - "h": 23 - } - }, - { - "filename": "336_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 22 - }, - "frame": { - "x": 249, - "y": 52, - "w": 25, - "h": 22 - } - }, - { - "filename": "311_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 274, - "y": 52, - "w": 18, - "h": 21 - } - }, - { - "filename": "328_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 292, - "y": 65, - "w": 21, - "h": 21 - } - }, - { - "filename": "304_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 14 - }, - "frame": { - "x": 274, - "y": 73, - "w": 18, - "h": 14 - } - }, - { - "filename": "333_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 292, - "y": 86, - "w": 21, - "h": 18 - } - }, - { - "filename": "292_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 252, - "y": 74, - "w": 22, - "h": 21 - } - }, - { - "filename": "311_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 274, - "y": 87, - "w": 18, - "h": 21 - } - }, - { - "filename": "333_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 292, - "y": 104, - "w": 21, - "h": 18 - } - }, - { - "filename": "292_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 252, - "y": 95, - "w": 22, - "h": 21 - } - }, - { - "filename": "304_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 14 - }, - "frame": { - "x": 274, - "y": 108, - "w": 18, - "h": 14 - } - }, - { - "filename": "351-snowy_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 199, - "y": 75, - "w": 19, - "h": 25 - } - }, - { - "filename": "336_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 22 - }, - "frame": { - "x": 218, - "y": 73, - "w": 25, - "h": 22 - } - }, - { - "filename": "351-snowy_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 200, - "y": 100, - "w": 19, - "h": 25 - } - }, - { - "filename": "338_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 219, - "y": 95, - "w": 23, - "h": 24 - } - }, - { - "filename": "351-snowy_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 202, - "y": 125, - "w": 19, - "h": 25 - } - }, - { - "filename": "338_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 202, - "y": 150, - "w": 23, - "h": 24 - } - }, - { - "filename": "372_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 221, - "y": 119, - "w": 22, - "h": 23 - } - }, - { - "filename": "264_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 243, - "y": 116, - "w": 24, - "h": 22 - } - }, - { - "filename": "385_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 267, - "y": 122, - "w": 24, - "h": 22 - } - }, - { - "filename": "300_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 291, - "y": 122, - "w": 22, - "h": 22 - } - }, - { - "filename": "385_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 243, - "y": 138, - "w": 24, - "h": 22 - } - }, - { - "filename": "311_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 225, - "y": 142, - "w": 18, - "h": 21 - } - }, - { - "filename": "385_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 267, - "y": 144, - "w": 24, - "h": 22 - } - }, - { - "filename": "300_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 291, - "y": 144, - "w": 22, - "h": 22 - } - }, - { - "filename": "285_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 - }, - "frame": { - "x": 225, - "y": 163, - "w": 20, - "h": 17 - } - }, - { - "filename": "300_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 245, - "y": 160, - "w": 22, - "h": 22 - } - }, - { - "filename": "339_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 23, - "h": 15 - }, - "frame": { - "x": 267, - "y": 166, - "w": 23, - "h": 15 - } - }, - { - "filename": "339_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 23, - "h": 15 - }, - "frame": { - "x": 290, - "y": 166, - "w": 23, - "h": 15 - } - }, - { - "filename": "352_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 218, - "y": 180, - "w": 22, - "h": 22 - } - }, - { - "filename": "352_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 240, - "y": 182, - "w": 22, - "h": 22 - } - }, - { - "filename": "351-sunny_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 220, - "y": 202, - "w": 20, - "h": 22 - } - }, - { - "filename": "351-sunny_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 220, - "y": 224, - "w": 20, - "h": 22 - } - }, - { - "filename": "352_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 22 - }, - "frame": { - "x": 240, - "y": 204, - "w": 22, - "h": 22 - } - }, - { - "filename": "351-sunny_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 240, - "y": 226, - "w": 20, - "h": 22 - } - }, - { - "filename": "307_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 22 - }, - "frame": { - "x": 238, - "y": 248, - "w": 19, - "h": 22 - } - }, - { - "filename": "351-rainy_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 262, - "y": 182, - "w": 16, - "h": 23 - } - }, - { - "filename": "307_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 22 - }, - "frame": { - "x": 278, - "y": 181, - "w": 19, - "h": 22 - } - }, - { - "filename": "351-rainy_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 297, - "y": 181, - "w": 16, - "h": 23 - } - }, - { - "filename": "298_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 21 - }, - "frame": { - "x": 262, - "y": 205, - "w": 17, - "h": 21 - } - }, - { - "filename": "312_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 260, - "y": 226, - "w": 18, - "h": 21 - } - }, - { - "filename": "312_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 279, - "y": 203, - "w": 18, - "h": 21 - } - }, - { - "filename": "280_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 16, - "h": 20 - }, - "frame": { - "x": 297, - "y": 204, - "w": 16, - "h": 20 - } - }, - { - "filename": "358_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 257, - "y": 248, - "w": 17, - "h": 23 - } - }, - { - "filename": "358_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 274, - "y": 247, - "w": 17, - "h": 23 - } - }, - { - "filename": "298_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 21 - }, - "frame": { - "x": 278, - "y": 226, - "w": 17, - "h": 21 - } - }, - { - "filename": "304_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 15, - "w": 18, - "h": 14 - }, - "frame": { - "x": 295, - "y": 224, - "w": 18, - "h": 14 - } - }, - { - "filename": "358_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 23 - }, - "frame": { - "x": 291, - "y": 247, - "w": 17, - "h": 23 - } - }, - { - "filename": "309_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 21, - "h": 17 - }, - "frame": { - "x": 274, - "y": 270, - "w": 21, - "h": 17 - } - }, - { - "filename": "371_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 22 - }, - "frame": { - "x": 295, - "y": 270, - "w": 17, - "h": 22 - } - }, - { - "filename": "371_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 22 - }, - "frame": { - "x": 238, - "y": 270, - "w": 17, - "h": 22 - } - }, - { - "filename": "285_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 - }, - "frame": { - "x": 252, - "y": 292, - "w": 20, - "h": 17 - } - }, - { - "filename": "309_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 21, - "h": 17 - }, - "frame": { - "x": 272, - "y": 287, - "w": 21, - "h": 17 - } } ] } @@ -3333,6 +3060,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:4d302b94674920539216d54bb8a9fe88:0f0f00e7b1d7fa7ef7b7aa927d6f70f1:039b026190bf1878996b3e03190bcdf3$" + "smartupdate": "$TexturePacker:SmartUpdate:fe9e19b5c1b79b10da0903466ff602a5:5a6a73e63e4cb8da03a476d6ad163542:039b026190bf1878996b3e03190bcdf3$" } } diff --git a/public/images/pokemon_icons_3v.png b/public/images/pokemon_icons_3v.png index cf0fa34606e..7e027e39367 100644 Binary files a/public/images/pokemon_icons_3v.png and b/public/images/pokemon_icons_3v.png differ diff --git a/public/images/pokemon_icons_4v.json b/public/images/pokemon_icons_4v.json index 454839d0902..a770e72252b 100644 --- a/public/images/pokemon_icons_4v.json +++ b/public/images/pokemon_icons_4v.json @@ -4,1649 +4,11 @@ "image": "pokemon_icons_4v.png", "format": "RGBA8888", "size": { - "w": 244, - "h": 244 + "w": 256, + "h": 202 }, "scale": 1, "frames": [ - { - "filename": "491_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 33, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 33, - "h": 30 - } - }, - { - "filename": "491_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 33, - "h": 30 - }, - "frame": { - "x": 0, - "y": 30, - "w": 33, - "h": 30 - } - }, - { - "filename": "428-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 35, - "h": 26 - }, - "frame": { - "x": 33, - "y": 0, - "w": 35, - "h": 26 - } - }, - { - "filename": "428-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 35, - "h": 26 - }, - "frame": { - "x": 33, - "y": 26, - "w": 35, - "h": 26 - } - }, - { - "filename": "445-mega_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 32, - "h": 26 - }, - "frame": { - "x": 0, - "y": 60, - "w": 32, - "h": 26 - } - }, - { - "filename": "445-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 32, - "h": 26 - }, - "frame": { - "x": 68, - "y": 0, - "w": 32, - "h": 26 - } - }, - { - "filename": "445-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 32, - "h": 26 - }, - "frame": { - "x": 0, - "y": 86, - "w": 32, - "h": 26 - } - }, - { - "filename": "487-altered_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 32, - "h": 26 - }, - "frame": { - "x": 68, - "y": 26, - "w": 32, - "h": 26 - } - }, - { - "filename": "487-altered_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 32, - "h": 26 - }, - "frame": { - "x": 100, - "y": 0, - "w": 32, - "h": 26 - } - }, - { - "filename": "485_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 35, - "h": 22 - }, - "frame": { - "x": 132, - "y": 0, - "w": 35, - "h": 22 - } - }, - { - "filename": "485_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 35, - "h": 22 - }, - "frame": { - "x": 167, - "y": 0, - "w": 35, - "h": 22 - } - }, - { - "filename": "487-origin_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 30, - "h": 27 - }, - "frame": { - "x": 0, - "y": 112, - "w": 30, - "h": 27 - } - }, - { - "filename": "487-origin_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 30, - "h": 27 - }, - "frame": { - "x": 0, - "y": 139, - "w": 30, - "h": 27 - } - }, - { - "filename": "445_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 100, - "y": 26, - "w": 31, - "h": 24 - } - }, - { - "filename": "475-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 27, - "h": 28 - }, - "frame": { - "x": 0, - "y": 166, - "w": 27, - "h": 28 - } - }, - { - "filename": "488_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 27, - "h": 28 - }, - "frame": { - "x": 0, - "y": 194, - "w": 27, - "h": 28 - } - }, - { - "filename": "490_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 0, - "y": 222, - "w": 24, - "h": 22 - } - }, - { - "filename": "445_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 202, - "y": 0, - "w": 31, - "h": 24 - } - }, - { - "filename": "490_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 24, - "y": 222, - "w": 24, - "h": 22 - } - }, - { - "filename": "445_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 33, - "y": 52, - "w": 31, - "h": 24 - } - }, - { - "filename": "481_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 64, - "y": 52, - "w": 31, - "h": 24 - } - }, - { - "filename": "481_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 32, - "y": 76, - "w": 31, - "h": 24 - } - }, - { - "filename": "481_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 63, - "y": 76, - "w": 31, - "h": 24 - } - }, - { - "filename": "468_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 32, - "y": 100, - "w": 30, - "h": 21 - } - }, - { - "filename": "488_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 27, - "h": 28 - }, - "frame": { - "x": 30, - "y": 121, - "w": 27, - "h": 28 - } - }, - { - "filename": "468_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 62, - "y": 100, - "w": 30, - "h": 21 - } - }, - { - "filename": "471_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 57, - "y": 121, - "w": 29, - "h": 25 - } - }, - { - "filename": "428_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 30, - "y": 149, - "w": 28, - "h": 24 - } - }, - { - "filename": "471_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 27, - "y": 173, - "w": 29, - "h": 25 - } - }, - { - "filename": "428_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 27, - "y": 198, - "w": 28, - "h": 24 - } - }, - { - "filename": "490_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 48, - "y": 222, - "w": 24, - "h": 22 - } - }, - { - "filename": "482_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 58, - "y": 146, - "w": 28, - "h": 26 - } - }, - { - "filename": "400_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 55, - "y": 198, - "w": 24, - "h": 24 - } - }, - { - "filename": "442_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 72, - "y": 222, - "w": 23, - "h": 22 - } - }, - { - "filename": "466_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 25 - }, - "frame": { - "x": 56, - "y": 173, - "w": 28, - "h": 25 - } - }, - { - "filename": "400_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 24, - "h": 24 - }, - "frame": { - "x": 79, - "y": 198, - "w": 24, - "h": 24 - } - }, - { - "filename": "442_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 95, - "y": 222, - "w": 23, - "h": 22 - } - }, - { - "filename": "426_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 84, - "y": 172, - "w": 26, - "h": 26 - } - }, - { - "filename": "425_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 24 - }, - "frame": { - "x": 103, - "y": 198, - "w": 17, - "h": 24 - } - }, - { - "filename": "429_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 - }, - "frame": { - "x": 86, - "y": 121, - "w": 21, - "h": 29 - } - }, - { - "filename": "433_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 86, - "y": 150, - "w": 25, - "h": 21 - } - }, - { - "filename": "433_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 92, - "y": 100, - "w": 25, - "h": 21 - } - }, - { - "filename": "470_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 94, - "y": 76, - "w": 27, - "h": 24 - } - }, - { - "filename": "470_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 95, - "y": 52, - "w": 27, - "h": 24 - } - }, - { - "filename": "429_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 - }, - "frame": { - "x": 107, - "y": 121, - "w": 21, - "h": 29 - } - }, - { - "filename": "425_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 24 - }, - "frame": { - "x": 111, - "y": 150, - "w": 17, - "h": 24 - } - }, - { - "filename": "427_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 110, - "y": 174, - "w": 20, - "h": 24 - } - }, - { - "filename": "433_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 25, - "h": 21 - }, - "frame": { - "x": 117, - "y": 100, - "w": 25, - "h": 21 - } - }, - { - "filename": "470_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 121, - "y": 76, - "w": 27, - "h": 24 - } - }, - { - "filename": "426_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 122, - "y": 50, - "w": 26, - "h": 26 - } - }, - { - "filename": "429_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 21, - "h": 29 - }, - "frame": { - "x": 128, - "y": 121, - "w": 21, - "h": 29 - } - }, - { - "filename": "480_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 128, - "y": 150, - "w": 28, - "h": 24 - } - }, - { - "filename": "466_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 25 - }, - "frame": { - "x": 130, - "y": 174, - "w": 28, - "h": 25 - } - }, - { - "filename": "427_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 131, - "y": 26, - "w": 20, - "h": 24 - } - }, - { - "filename": "471_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 151, - "y": 22, - "w": 29, - "h": 25 - } - }, - { - "filename": "448-mega_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 21, - "h": 26 - }, - "frame": { - "x": 180, - "y": 22, - "w": 21, - "h": 26 - } - }, - { - "filename": "466_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 25 - }, - "frame": { - "x": 201, - "y": 24, - "w": 28, - "h": 25 - } - }, - { - "filename": "468_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 30, - "h": 21 - }, - "frame": { - "x": 120, - "y": 199, - "w": 30, - "h": 21 - } - }, - { - "filename": "480_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 120, - "y": 220, - "w": 28, - "h": 24 - } - }, - { - "filename": "480_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 148, - "y": 220, - "w": 28, - "h": 24 - } - }, - { - "filename": "443_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 150, - "y": 199, - "w": 21, - "h": 21 - } - }, - { - "filename": "440_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 - }, - "frame": { - "x": 142, - "y": 100, - "w": 16, - "h": 21 - } - }, - { - "filename": "475_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 24, - "h": 27 - }, - "frame": { - "x": 149, - "y": 121, - "w": 24, - "h": 27 - } - }, - { - "filename": "448-mega_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 21, - "h": 26 - }, - "frame": { - "x": 156, - "y": 148, - "w": 21, - "h": 26 - } - }, - { - "filename": "492-sky_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 158, - "y": 174, - "w": 23, - "h": 24 - } - }, - { - "filename": "482_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 151, - "y": 47, - "w": 28, - "h": 26 - } - }, - { - "filename": "482_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 148, - "y": 73, - "w": 28, - "h": 26 - } - }, - { - "filename": "448-mega_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 21, - "h": 26 - }, - "frame": { - "x": 179, - "y": 48, - "w": 21, - "h": 26 - } - }, - { - "filename": "444_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 200, - "y": 49, - "w": 25, - "h": 23 - } - }, - { - "filename": "444_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 176, - "y": 74, - "w": 25, - "h": 23 - } - }, - { - "filename": "444_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 201, - "y": 72, - "w": 25, - "h": 23 - } - }, - { - "filename": "443_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, - "h": 21 - }, - "frame": { - "x": 158, - "y": 99, - "w": 21, - "h": 21 - } - }, - { - "filename": "492-sky_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 179, - "y": 97, - "w": 23, - "h": 24 - } - }, - { - "filename": "494_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 202, - "y": 95, - "w": 20, - "h": 24 - } - }, - { - "filename": "458_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 222, - "y": 95, - "w": 22, - "h": 19 - } - }, - { - "filename": "458_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 22, - "h": 19 - }, - "frame": { - "x": 222, - "y": 114, - "w": 22, - "h": 19 - } - }, - { - "filename": "489_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 173, - "y": 121, - "w": 25, - "h": 19 - } - }, - { - "filename": "447_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 20, - "h": 20 - }, - "frame": { - "x": 202, - "y": 119, - "w": 20, - "h": 20 - } - }, { "filename": "399_2", "rotated": false, @@ -1655,59 +17,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 18 - }, - "frame": { - "x": 222, - "y": 133, - "w": 22, - "h": 18 - } - }, - { - "filename": "494_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 10, - "y": 5, + "y": 12, "w": 20, - "h": 24 + "h": 16 }, "frame": { - "x": 177, - "y": 140, + "x": 0, + "y": 0, "w": 20, - "h": 24 - } - }, - { - "filename": "489_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 197, - "y": 140, - "w": 25, - "h": 19 + "h": 16 } }, { @@ -1719,16 +39,142 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 18 + "x": 10, + "y": 12, + "w": 20, + "h": 16 }, "frame": { - "x": 222, - "y": 151, - "w": 22, - "h": 18 + "x": 20, + "y": 0, + "w": 20, + "h": 16 + } + }, + { + "filename": "492-land_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 18, + "h": 16 + }, + "frame": { + "x": 40, + "y": 0, + "w": 18, + "h": 16 + } + }, + { + "filename": "492-land_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 18, + "h": 16 + }, + "frame": { + "x": 58, + "y": 0, + "w": 18, + "h": 16 + } + }, + { + "filename": "458_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 17 + }, + "frame": { + "x": 76, + "y": 0, + "w": 20, + "h": 17 + } + }, + { + "filename": "458_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 20, + "h": 17 + }, + "frame": { + "x": 96, + "y": 0, + "w": 20, + "h": 17 + } + }, + { + "filename": "489_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 116, + "y": 0, + "w": 23, + "h": 17 + } + }, + { + "filename": "489_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 139, + "y": 0, + "w": 23, + "h": 17 } }, { @@ -1740,15 +186,162 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, + "x": 11, + "y": 11, + "w": 23, + "h": 17 + }, + "frame": { + "x": 162, + "y": 0, + "w": 23, + "h": 17 + } + }, + { + "filename": "447_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, "y": 10, - "w": 25, + "w": 18, + "h": 18 + }, + "frame": { + "x": 185, + "y": 0, + "w": 18, + "h": 18 + } + }, + { + "filename": "447_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 18, + "h": 18 + }, + "frame": { + "x": 203, + "y": 0, + "w": 18, + "h": 18 + } + }, + { + "filename": "447_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 18, + "h": 18 + }, + "frame": { + "x": 221, + "y": 0, + "w": 18, + "h": 18 + } + }, + { + "filename": "440_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 14, "h": 19 }, "frame": { - "x": 197, - "y": 159, - "w": 25, + "x": 239, + "y": 0, + "w": 14, + "h": 19 + } + }, + { + "filename": "433_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 0, + "y": 16, + "w": 23, + "h": 19 + } + }, + { + "filename": "433_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 23, + "y": 16, + "w": 23, + "h": 19 + } + }, + { + "filename": "433_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 46, + "y": 16, + "w": 23, "h": 19 } }, @@ -1761,16 +354,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 + "x": 13, + "y": 9, + "w": 14, + "h": 19 }, "frame": { - "x": 181, - "y": 164, - "w": 16, - "h": 21 + "x": 69, + "y": 17, + "w": 14, + "h": 19 } }, { @@ -1782,20 +375,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 21 + "x": 13, + "y": 9, + "w": 14, + "h": 19 }, "frame": { - "x": 171, - "y": 198, - "w": 16, - "h": 21 + "x": 83, + "y": 17, + "w": 14, + "h": 19 } }, { - "filename": "448_1", + "filename": "443_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1804,15 +397,36 @@ }, "spriteSourceSize": { "x": 11, - "y": 6, - "w": 18, - "h": 23 + "y": 9, + "w": 19, + "h": 19 }, "frame": { - "x": 176, - "y": 219, - "w": 18, - "h": 23 + "x": 97, + "y": 17, + "w": 19, + "h": 19 + } + }, + { + "filename": "443_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 116, + "y": 17, + "w": 19, + "h": 19 } }, { @@ -1824,15 +438,246 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 21, + "x": 11, + "y": 9, + "w": 19, + "h": 19 + }, + "frame": { + "x": 135, + "y": 17, + "w": 19, + "h": 19 + } + }, + { + "filename": "468_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 28, + "h": 19 + }, + "frame": { + "x": 154, + "y": 17, + "w": 28, + "h": 19 + } + }, + { + "filename": "468_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 28, + "h": 19 + }, + "frame": { + "x": 182, + "y": 18, + "w": 28, + "h": 19 + } + }, + { + "filename": "468_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 28, + "h": 19 + }, + "frame": { + "x": 210, + "y": 18, + "w": 28, + "h": 19 + } + }, + { + "filename": "448_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, "h": 21 }, "frame": { - "x": 222, - "y": 169, + "x": 238, + "y": 19, + "w": 16, + "h": 21 + } + }, + { + "filename": "442_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, "w": 21, + "h": 20 + }, + "frame": { + "x": 0, + "y": 35, + "w": 21, + "h": 20 + } + }, + { + "filename": "442_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 21, + "y": 35, + "w": 21, + "h": 20 + } + }, + { + "filename": "490_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 42, + "y": 35, + "w": 22, + "h": 20 + } + }, + { + "filename": "485_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 33, + "h": 20 + }, + "frame": { + "x": 64, + "y": 36, + "w": 33, + "h": 20 + } + }, + { + "filename": "490_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 97, + "y": 36, + "w": 22, + "h": 20 + } + }, + { + "filename": "490_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 119, + "y": 36, + "w": 22, + "h": 20 + } + }, + { + "filename": "444_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 141, + "y": 36, + "w": 23, "h": 21 } }, @@ -1845,16 +690,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 + "x": 12, + "y": 7, + "w": 16, + "h": 21 }, "frame": { - "x": 225, - "y": 49, - "w": 18, - "h": 23 + "x": 164, + "y": 36, + "w": 16, + "h": 21 + } + }, + { + "filename": "444_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 180, + "y": 37, + "w": 23, + "h": 21 + } + }, + { + "filename": "444_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 203, + "y": 37, + "w": 23, + "h": 21 } }, { @@ -1866,20 +753,545 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 + "x": 12, + "y": 7, + "w": 16, + "h": 21 }, "frame": { "x": 226, - "y": 72, + "y": 40, + "w": 16, + "h": 21 + } + }, + { + "filename": "400_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 0, + "y": 55, + "w": 22, + "h": 22 + } + }, + { + "filename": "400_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 22, + "h": 22 + }, + "frame": { + "x": 22, + "y": 55, + "w": 22, + "h": 22 + } + }, + { + "filename": "425_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 15, + "h": 22 + }, + "frame": { + "x": 44, + "y": 55, + "w": 15, + "h": 22 + } + }, + { + "filename": "425_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 15, + "h": 22 + }, + "frame": { + "x": 59, + "y": 56, + "w": 15, + "h": 22 + } + }, + { + "filename": "427_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, "w": 18, + "h": 22 + }, + "frame": { + "x": 74, + "y": 56, + "w": 18, + "h": 22 + } + }, + { + "filename": "427_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 92, + "y": 56, + "w": 18, + "h": 22 + } + }, + { + "filename": "428_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 110, + "y": 56, + "w": 26, + "h": 22 + } + }, + { + "filename": "428_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 136, + "y": 57, + "w": 26, + "h": 22 + } + }, + { + "filename": "494_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 162, + "y": 57, + "w": 18, + "h": 22 + } + }, + { + "filename": "445_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 180, + "y": 58, + "w": 29, + "h": 22 + } + }, + { + "filename": "445_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 209, + "y": 61, + "w": 29, + "h": 22 + } + }, + { + "filename": "494_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 238, + "y": 61, + "w": 18, + "h": 22 + } + }, + { + "filename": "445_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 0, + "y": 77, + "w": 29, + "h": 22 + } + }, + { + "filename": "470_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 29, + "y": 77, + "w": 25, + "h": 22 + } + }, + { + "filename": "470_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 54, + "y": 78, + "w": 25, + "h": 22 + } + }, + { + "filename": "470_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 79, + "y": 78, + "w": 25, + "h": 22 + } + }, + { + "filename": "480_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 104, + "y": 78, + "w": 26, + "h": 22 + } + }, + { + "filename": "480_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 130, + "y": 79, + "w": 26, + "h": 22 + } + }, + { + "filename": "492-sky_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 156, + "y": 79, + "w": 21, + "h": 22 + } + }, + { + "filename": "480_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 177, + "y": 80, + "w": 26, + "h": 22 + } + }, + { + "filename": "481_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 203, + "y": 83, + "w": 29, + "h": 22 + } + }, + { + "filename": "492-sky_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 232, + "y": 83, + "w": 21, + "h": 22 + } + }, + { + "filename": "481_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 0, + "y": 99, + "w": 29, + "h": 22 + } + }, + { + "filename": "481_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 29, + "y": 100, + "w": 29, + "h": 22 + } + }, + { + "filename": "466_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 23 + }, + "frame": { + "x": 58, + "y": 100, + "w": 26, "h": 23 } }, { - "filename": "447_2", + "filename": "466_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1887,20 +1299,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 20, - "h": 20 + "x": 7, + "y": 5, + "w": 26, + "h": 23 }, "frame": { - "x": 197, - "y": 178, - "w": 20, - "h": 20 + "x": 84, + "y": 100, + "w": 26, + "h": 23 } }, { - "filename": "447_3", + "filename": "448-mega_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1908,20 +1320,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 20, - "h": 20 + "x": 12, + "y": 4, + "w": 19, + "h": 24 }, "frame": { - "x": 187, - "y": 198, - "w": 20, - "h": 20 + "x": 110, + "y": 100, + "w": 19, + "h": 24 } }, { - "filename": "492-land_2", + "filename": "466_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1929,20 +1341,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 20, - "h": 18 + "x": 7, + "y": 5, + "w": 26, + "h": 23 }, "frame": { - "x": 194, - "y": 218, - "w": 20, - "h": 18 + "x": 129, + "y": 101, + "w": 26, + "h": 23 } }, { - "filename": "492-land_3", + "filename": "448-mega_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1950,16 +1362,625 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 20, - "h": 18 + "x": 12, + "y": 4, + "w": 19, + "h": 24 + }, + "frame": { + "x": 155, + "y": 101, + "w": 19, + "h": 24 + } + }, + { + "filename": "471_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 174, + "y": 102, + "w": 27, + "h": 23 + } + }, + { + "filename": "471_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 201, + "y": 105, + "w": 27, + "h": 23 + } + }, + { + "filename": "471_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 228, + "y": 105, + "w": 27, + "h": 23 + } + }, + { + "filename": "426_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 0, + "y": 121, + "w": 24, + "h": 24 + } + }, + { + "filename": "426_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 24, + "y": 122, + "w": 24, + "h": 24 + } + }, + { + "filename": "428-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 33, + "h": 24 + }, + "frame": { + "x": 48, + "y": 123, + "w": 33, + "h": 24 + } + }, + { + "filename": "448-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 19, + "h": 24 + }, + "frame": { + "x": 81, + "y": 123, + "w": 19, + "h": 24 + } + }, + { + "filename": "428-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 33, + "h": 24 + }, + "frame": { + "x": 100, + "y": 124, + "w": 33, + "h": 24 + } + }, + { + "filename": "475_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 133, + "y": 124, + "w": 22, + "h": 25 + } + }, + { + "filename": "482_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 155, + "y": 125, + "w": 26, + "h": 24 + } + }, + { + "filename": "482_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 181, + "y": 128, + "w": 26, + "h": 24 + } + }, + { + "filename": "482_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 26, + "h": 24 }, "frame": { "x": 207, - "y": 198, - "w": 20, - "h": 18 + "y": 128, + "w": 26, + "h": 24 + } + }, + { + "filename": "475_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 22, + "h": 25 + }, + "frame": { + "x": 233, + "y": 128, + "w": 22, + "h": 25 + } + }, + { + "filename": "487-altered_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 30, + "h": 24 + }, + "frame": { + "x": 0, + "y": 146, + "w": 30, + "h": 24 + } + }, + { + "filename": "487-altered_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 30, + "h": 24 + }, + "frame": { + "x": 30, + "y": 147, + "w": 30, + "h": 24 + } + }, + { + "filename": "445-mega_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 30, + "h": 25 + }, + "frame": { + "x": 60, + "y": 147, + "w": 30, + "h": 25 + } + }, + { + "filename": "445-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 30, + "h": 25 + }, + "frame": { + "x": 90, + "y": 148, + "w": 30, + "h": 25 + } + }, + { + "filename": "445-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 30, + "h": 25 + }, + "frame": { + "x": 120, + "y": 149, + "w": 30, + "h": 25 + } + }, + { + "filename": "487-origin_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 28, + "h": 25 + }, + "frame": { + "x": 150, + "y": 149, + "w": 28, + "h": 25 + } + }, + { + "filename": "487-origin_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 28, + "h": 25 + }, + "frame": { + "x": 178, + "y": 152, + "w": 28, + "h": 25 + } + }, + { + "filename": "475-mega_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 206, + "y": 152, + "w": 25, + "h": 26 + } + }, + { + "filename": "475-mega_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 231, + "y": 153, + "w": 25, + "h": 26 + } + }, + { + "filename": "488_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 0, + "y": 170, + "w": 25, + "h": 26 + } + }, + { + "filename": "488_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 25, + "y": 171, + "w": 25, + "h": 26 + } + }, + { + "filename": "429_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 19, + "h": 28 + }, + "frame": { + "x": 50, + "y": 172, + "w": 19, + "h": 28 + } + }, + { + "filename": "429_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 19, + "h": 28 + }, + "frame": { + "x": 69, + "y": 172, + "w": 19, + "h": 28 + } + }, + { + "filename": "429_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 19, + "h": 28 + }, + "frame": { + "x": 88, + "y": 173, + "w": 19, + "h": 28 + } + }, + { + "filename": "491_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 31, + "h": 28 + }, + "frame": { + "x": 107, + "y": 174, + "w": 31, + "h": 28 + } + }, + { + "filename": "491_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 31, + "h": 28 + }, + "frame": { + "x": 138, + "y": 174, + "w": 31, + "h": 28 } } ] @@ -1968,6 +1989,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:50229db50e6fdeeddc00f6680fef990a:2eb914ae807a72595f2c98a7bec4a5e9:ebc3f8ec5b2480b298192d752b6e57dc$" + "smartupdate": "$TexturePacker:SmartUpdate:de4e27f78768a8605cf4f97791208075:bbca43ac1ce18dfd5a6af6b9ac751c1c:ebc3f8ec5b2480b298192d752b6e57dc$" } } diff --git a/public/images/pokemon_icons_4v.png b/public/images/pokemon_icons_4v.png index 655d97b41e5..6313712748a 100644 Binary files a/public/images/pokemon_icons_4v.png and b/public/images/pokemon_icons_4v.png differ diff --git a/public/images/pokemon_icons_5v.json b/public/images/pokemon_icons_5v.json index 0fec54c8b0d..2cb388fe4b8 100644 --- a/public/images/pokemon_icons_5v.json +++ b/public/images/pokemon_icons_5v.json @@ -4,13 +4,13 @@ "image": "pokemon_icons_5v.png", "format": "RGBA8888", "size": { - "w": 272, - "h": 272 + "w": 256, + "h": 212 }, "scale": 1, "frames": [ { - "filename": "642-incarnate_1", + "filename": "546_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -18,20 +18,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 33, - "h": 29 + "x": 10, + "y": 14, + "w": 21, + "h": 14 }, "frame": { "x": 0, "y": 0, - "w": 33, - "h": 29 + "w": 21, + "h": 14 } }, { - "filename": "642-therian_1", + "filename": "546_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -39,20 +39,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 34, - "h": 28 + "x": 10, + "y": 14, + "w": 21, + "h": 14 }, "frame": { - "x": 33, + "x": 21, "y": 0, - "w": 34, - "h": 28 + "w": 21, + "h": 14 } }, { - "filename": "641-therian_1", + "filename": "577_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -60,20 +60,272 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 13, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 42, "y": 0, - "w": 32, - "h": 29 + "w": 15, + "h": 14 + } + }, + { + "filename": "577_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 57, + "y": 0, + "w": 15, + "h": 14 + } + }, + { + "filename": "577_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 72, + "y": 0, + "w": 15, + "h": 14 + } + }, + { + "filename": "541_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 16 + }, + "frame": { + "x": 87, + "y": 0, + "w": 20, + "h": 16 + } + }, + { + "filename": "541_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 16 + }, + "frame": { + "x": 107, + "y": 0, + "w": 20, + "h": 16 + } + }, + { + "filename": "559_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 127, + "y": 0, + "w": 15, + "h": 16 + } + }, + { + "filename": "559_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 142, + "y": 0, + "w": 15, + "h": 16 + } + }, + { + "filename": "559_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 157, + "y": 0, + "w": 15, + "h": 16 + } + }, + { + "filename": "562_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 22, + "h": 16 + }, + "frame": { + "x": 172, + "y": 0, + "w": 22, + "h": 16 + } + }, + { + "filename": "562_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 22, + "h": 16 + }, + "frame": { + "x": 194, + "y": 0, + "w": 22, + "h": 16 + } + }, + { + "filename": "595_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 21, + "h": 16 + }, + "frame": { + "x": 216, + "y": 0, + "w": 21, + "h": 16 + } + }, + { + "filename": "540_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 15, + "h": 17 + }, + "frame": { + "x": 237, + "y": 0, + "w": 15, + "h": 17 + } + }, + { + "filename": "595_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 12, + "w": 21, + "h": 16 }, "frame": { "x": 0, - "y": 29, - "w": 32, - "h": 29 + "y": 14, + "w": 21, + "h": 16 } }, { - "filename": "645-incarnate_1", + "filename": "632_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -81,20 +333,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 33, - "h": 28 + "x": 8, + "y": 12, + "w": 24, + "h": 16 }, "frame": { - "x": 67, - "y": 0, - "w": 33, - "h": 28 + "x": 21, + "y": 14, + "w": 24, + "h": 16 } }, { - "filename": "641-incarnate_1", + "filename": "632_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -102,16 +354,1549 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 28 + "x": 8, + "y": 12, + "w": 24, + "h": 16 + }, + "frame": { + "x": 45, + "y": 14, + "w": 24, + "h": 16 + } + }, + { + "filename": "540_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 15, + "h": 17 + }, + "frame": { + "x": 69, + "y": 14, + "w": 15, + "h": 17 + } + }, + { + "filename": "495_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 20, + "h": 17 + }, + "frame": { + "x": 84, + "y": 16, + "w": 20, + "h": 17 + } + }, + { + "filename": "495_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 20, + "h": 17 + }, + "frame": { + "x": 104, + "y": 16, + "w": 20, + "h": 17 + } + }, + { + "filename": "570_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 124, + "y": 16, + "w": 16, + "h": 17 + } + }, + { + "filename": "570_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 140, + "y": 16, + "w": 16, + "h": 17 + } + }, + { + "filename": "548_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 12, + "h": 18 + }, + "frame": { + "x": 156, + "y": 16, + "w": 12, + "h": 18 + } + }, + { + "filename": "548_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 12, + "h": 18 + }, + "frame": { + "x": 168, + "y": 16, + "w": 12, + "h": 18 + } + }, + { + "filename": "548_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 12, + "h": 18 + }, + "frame": { + "x": 180, + "y": 16, + "w": 12, + "h": 18 + } + }, + { + "filename": "607_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 192, + "y": 16, + "w": 13, + "h": 18 + } + }, + { + "filename": "607_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 205, + "y": 16, + "w": 13, + "h": 18 + } + }, + { + "filename": "608_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 19, + "h": 18 + }, + "frame": { + "x": 218, + "y": 16, + "w": 19, + "h": 18 + } + }, + { + "filename": "608_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 19, + "h": 18 + }, + "frame": { + "x": 237, + "y": 17, + "w": 19, + "h": 18 + } + }, + { + "filename": "622_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 18, + "h": 18 }, "frame": { "x": 0, - "y": 58, - "w": 32, - "h": 28 + "y": 30, + "w": 18, + "h": 18 + } + }, + { + "filename": "622_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 18, + "h": 18 + }, + "frame": { + "x": 18, + "y": 30, + "w": 18, + "h": 18 + } + }, + { + "filename": "532_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 24, + "h": 19 + }, + "frame": { + "x": 36, + "y": 30, + "w": 24, + "h": 19 + } + }, + { + "filename": "532_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 24, + "h": 19 + }, + "frame": { + "x": 60, + "y": 31, + "w": 24, + "h": 19 + } + }, + { + "filename": "572_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 22, + "h": 19 + }, + "frame": { + "x": 84, + "y": 33, + "w": 22, + "h": 19 + } + }, + { + "filename": "572_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 22, + "h": 19 + }, + "frame": { + "x": 106, + "y": 33, + "w": 22, + "h": 19 + } + }, + { + "filename": "578_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 128, + "y": 33, + "w": 16, + "h": 19 + } + }, + { + "filename": "578_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 144, + "y": 34, + "w": 16, + "h": 19 + } + }, + { + "filename": "578_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 16, + "h": 19 + }, + "frame": { + "x": 160, + "y": 34, + "w": 16, + "h": 19 + } + }, + { + "filename": "636_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 176, + "y": 34, + "w": 20, + "h": 19 + } + }, + { + "filename": "636_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 196, + "y": 34, + "w": 20, + "h": 19 + } + }, + { + "filename": "610_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 216, + "y": 34, + "w": 18, + "h": 20 + } + }, + { + "filename": "496_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 234, + "y": 35, + "w": 22, + "h": 20 + } + }, + { + "filename": "496_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 0, + "y": 48, + "w": 22, + "h": 20 + } + }, + { + "filename": "538_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 28, + "h": 20 + }, + "frame": { + "x": 22, + "y": 49, + "w": 28, + "h": 20 + } + }, + { + "filename": "538_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 28, + "h": 20 + }, + "frame": { + "x": 50, + "y": 50, + "w": 28, + "h": 20 + } + }, + { + "filename": "610_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 18, + "h": 20 + }, + "frame": { + "x": 78, + "y": 52, + "w": 18, + "h": 20 + } + }, + { + "filename": "633_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 96, + "y": 52, + "w": 16, + "h": 20 + } + }, + { + "filename": "633_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 112, + "y": 52, + "w": 16, + "h": 20 + } + }, + { + "filename": "542_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 128, + "y": 52, + "w": 14, + "h": 21 + } + }, + { + "filename": "542_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 142, + "y": 53, + "w": 14, + "h": 21 + } + }, + { + "filename": "549_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 156, + "y": 53, + "w": 17, + "h": 21 + } + }, + { + "filename": "549_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 173, + "y": 53, + "w": 17, + "h": 21 + } + }, + { + "filename": "560_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 190, + "y": 53, + "w": 20, + "h": 21 + } + }, + { + "filename": "560_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 210, + "y": 54, + "w": 20, + "h": 21 + } + }, + { + "filename": "560_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 230, + "y": 55, + "w": 20, + "h": 21 + } + }, + { + "filename": "648-aria_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 0, + "y": 68, + "w": 14, + "h": 21 + } + }, + { + "filename": "579_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 21 + }, + "frame": { + "x": 14, + "y": 69, + "w": 30, + "h": 21 + } + }, + { + "filename": "579_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 21 + }, + "frame": { + "x": 44, + "y": 70, + "w": 30, + "h": 21 + } + }, + { + "filename": "579_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 30, + "h": 21 + }, + "frame": { + "x": 74, + "y": 72, + "w": 30, + "h": 21 + } + }, + { + "filename": "648-aria_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 104, + "y": 72, + "w": 14, + "h": 21 + } + }, + { + "filename": "547_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 118, + "y": 73, + "w": 21, + "h": 22 + } + }, + { + "filename": "611_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 139, + "y": 74, + "w": 25, + "h": 21 + } + }, + { + "filename": "611_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 164, + "y": 74, + "w": 25, + "h": 21 + } + }, + { + "filename": "547_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 189, + "y": 74, + "w": 21, + "h": 22 + } + }, + { + "filename": "585-autumn_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 210, + "y": 75, + "w": 18, + "h": 22 + } + }, + { + "filename": "497_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 22 + }, + "frame": { + "x": 228, + "y": 76, + "w": 28, + "h": 22 + } + }, + { + "filename": "497_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 22 + }, + "frame": { + "x": 0, + "y": 90, + "w": 28, + "h": 22 + } + }, + { + "filename": "571_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 28, + "y": 91, + "w": 29, + "h": 22 + } + }, + { + "filename": "648-pirouette_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 15, + "h": 23 + }, + "frame": { + "x": 57, + "y": 91, + "w": 15, + "h": 23 + } + }, + { + "filename": "571_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 72, + "y": 93, + "w": 29, + "h": 22 + } + }, + { + "filename": "648-pirouette_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 15, + "h": 23 + }, + "frame": { + "x": 101, + "y": 93, + "w": 15, + "h": 23 + } + }, + { + "filename": "585-spring_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 116, + "y": 95, + "w": 18, + "h": 22 + } + }, + { + "filename": "585-summer_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 134, + "y": 95, + "w": 18, + "h": 22 + } + }, + { + "filename": "585-winter_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 152, + "y": 95, + "w": 18, + "h": 22 + } + }, + { + "filename": "596_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 22 + }, + "frame": { + "x": 170, + "y": 96, + "w": 28, + "h": 22 + } + }, + { + "filename": "596_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 22 + }, + "frame": { + "x": 198, + "y": 97, + "w": 28, + "h": 22 + } + }, + { + "filename": "634_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 226, + "y": 98, + "w": 26, + "h": 22 + } + }, + { + "filename": "634_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 0, + "y": 112, + "w": 26, + "h": 22 + } + }, + { + "filename": "637_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 26, + "y": 113, + "w": 26, + "h": 22 + } + }, + { + "filename": "637_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 52, + "y": 115, + "w": 26, + "h": 22 + } + }, + { + "filename": "586-spring_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 78, + "y": 115, + "w": 23, + "h": 24 + } + }, + { + "filename": "609_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 29, + "h": 23 + }, + "frame": { + "x": 101, + "y": 117, + "w": 29, + "h": 23 + } + }, + { + "filename": "609_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 29, + "h": 23 + }, + "frame": { + "x": 130, + "y": 117, + "w": 29, + "h": 23 + } + }, + { + "filename": "533_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 27, + "h": 24 + }, + "frame": { + "x": 159, + "y": 118, + "w": 27, + "h": 24 + } + }, + { + "filename": "533_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 27, + "h": 24 + }, + "frame": { + "x": 186, + "y": 119, + "w": 27, + "h": 24 + } + }, + { + "filename": "586-summer_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 213, + "y": 120, + "w": 23, + "h": 24 + } + }, + { + "filename": "586-winter_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 0, + "y": 134, + "w": 23, + "h": 24 + } + }, + { + "filename": "612_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 23, + "y": 135, + "w": 26, + "h": 24 + } + }, + { + "filename": "612_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 49, + "y": 137, + "w": 26, + "h": 24 + } + }, + { + "filename": "586-autumn_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 75, + "y": 139, + "w": 25, + "h": 25 } }, { @@ -123,20 +1908,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 33, - "h": 26 + "x": 4, + "y": 5, + "w": 31, + "h": 25 }, "frame": { "x": 100, - "y": 0, - "w": 33, - "h": 26 + "y": 140, + "w": 31, + "h": 25 } }, { - "filename": "534_3", + "filename": "623_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -144,16 +1929,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 4, - "w": 33, - "h": 26 + "x": 6, + "y": 3, + "w": 26, + "h": 25 }, "frame": { - "x": 133, - "y": 0, - "w": 33, - "h": 26 + "x": 131, + "y": 140, + "w": 26, + "h": 25 + } + }, + { + "filename": "623_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 26, + "h": 25 + }, + "frame": { + "x": 157, + "y": 142, + "w": 26, + "h": 25 } }, { @@ -165,16 +1971,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 32, - "h": 27 + "x": 5, + "y": 3, + "w": 30, + "h": 25 }, "frame": { - "x": 0, - "y": 86, - "w": 32, - "h": 27 + "x": 183, + "y": 143, + "w": 30, + "h": 25 + } + }, + { + "filename": "534_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 31, + "h": 25 + }, + "frame": { + "x": 213, + "y": 144, + "w": 31, + "h": 25 } }, { @@ -186,16 +2013,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 32, - "h": 27 + "x": 5, + "y": 3, + "w": 30, + "h": 25 }, "frame": { "x": 0, - "y": 113, - "w": 32, - "h": 27 + "y": 159, + "w": 30, + "h": 25 } }, { @@ -207,16 +2034,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 31, - "h": 27 + "x": 6, + "y": 3, + "w": 29, + "h": 25 }, "frame": { - "x": 0, - "y": 140, - "w": 31, - "h": 27 + "x": 30, + "y": 161, + "w": 29, + "h": 25 } }, { @@ -227,15 +2054,120 @@ "w": 40, "h": 30 }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 59, + "y": 164, + "w": 29, + "h": 25 + } + }, + { + "filename": "641-incarnate_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, "spriteSourceSize": { "x": 5, "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 88, + "y": 165, + "w": 30, + "h": 26 + } + }, + { + "filename": "642-therian_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 3, + "w": 32, + "h": 26 + }, + "frame": { + "x": 118, + "y": 165, + "w": 32, + "h": 26 + } + }, + { + "filename": "645-incarnate_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 2, + "w": 31, + "h": 26 + }, + "frame": { + "x": 150, + "y": 167, + "w": 31, + "h": 26 + } + }, + { + "filename": "641-therian_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 27 + }, + "frame": { + "x": 181, + "y": 168, + "w": 30, + "h": 27 + } + }, + { + "filename": "642-incarnate_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, "w": 31, "h": 27 }, "frame": { - "x": 0, - "y": 167, + "x": 211, + "y": 169, "w": 31, "h": 27 } @@ -249,2368 +2181,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 0, - "w": 29, - "h": 29 + "w": 27, + "h": 28 }, "frame": { "x": 0, - "y": 194, - "w": 29, - "h": 29 - } - }, - { - "filename": "609_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 31, - "h": 25 - }, - "frame": { - "x": 166, - "y": 0, - "w": 31, - "h": 25 - } - }, - { - "filename": "609_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 31, - "h": 25 - }, - "frame": { - "x": 197, - "y": 0, - "w": 31, - "h": 25 - } - }, - { - "filename": "533_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 29, - "h": 26 - }, - "frame": { - "x": 0, - "y": 223, - "w": 29, - "h": 26 - } - }, - { - "filename": "579_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 23 - }, - "frame": { - "x": 0, - "y": 249, - "w": 32, - "h": 23 - } - }, - { - "filename": "571_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 228, - "y": 0, - "w": 31, - "h": 24 - } - }, - { - "filename": "579_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 23 - }, - "frame": { - "x": 100, - "y": 26, - "w": 32, - "h": 23 - } - }, - { - "filename": "579_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 32, - "h": 23 - }, - "frame": { - "x": 132, - "y": 26, - "w": 32, - "h": 23 - } - }, - { - "filename": "571_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 166, - "y": 25, - "w": 31, - "h": 24 - } - }, - { - "filename": "497_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 30, - "h": 24 - }, - "frame": { - "x": 197, - "y": 25, - "w": 30, - "h": 24 - } - }, - { - "filename": "497_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 30, - "h": 24 - }, - "frame": { - "x": 228, - "y": 24, - "w": 30, - "h": 24 - } - }, - { - "filename": "548_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 20 - }, - "frame": { - "x": 258, - "y": 24, - "w": 14, - "h": 20 - } - }, - { - "filename": "548_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 20 - }, - "frame": { - "x": 258, - "y": 44, - "w": 14, - "h": 20 - } - }, - { - "filename": "538_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 30, - "h": 22 - }, - "frame": { - "x": 33, - "y": 28, - "w": 30, - "h": 22 - } - }, - { - "filename": "533_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 29, - "h": 26 - }, - "frame": { - "x": 32, - "y": 50, - "w": 29, - "h": 26 - } - }, - { - "filename": "623_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 32, - "y": 76, - "w": 28, - "h": 27 - } - }, - { - "filename": "623_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 32, - "y": 103, - "w": 28, - "h": 27 - } - }, - { - "filename": "538_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 30, - "h": 22 - }, - "frame": { - "x": 63, - "y": 28, - "w": 30, - "h": 22 - } - }, - { - "filename": "593_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 30, - "h": 24 - }, - "frame": { - "x": 61, - "y": 50, - "w": 30, - "h": 24 - } - }, - { - "filename": "593-f_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 29, - "h": 24 - }, - "frame": { - "x": 32, - "y": 130, - "w": 29, - "h": 24 - } - }, - { - "filename": "586-autumn_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, + "y": 184, "w": 27, - "h": 27 - }, - "frame": { - "x": 31, - "y": 154, - "w": 27, - "h": 27 - } - }, - { - "filename": "593-f_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 29, - "h": 24 - }, - "frame": { - "x": 31, - "y": 181, - "w": 29, - "h": 24 - } - }, - { - "filename": "593_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 30, - "h": 24 - }, - "frame": { - "x": 29, - "y": 205, - "w": 30, - "h": 24 - } - }, - { - "filename": "608_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 21, - "h": 20 - }, - "frame": { - "x": 29, - "y": 229, - "w": 21, - "h": 20 - } - }, - { - "filename": "611_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 32, - "y": 249, - "w": 27, - "h": 23 - } - }, - { - "filename": "548_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 14, - "h": 20 - }, - "frame": { - "x": 50, - "y": 229, - "w": 14, - "h": 20 - } - }, - { - "filename": "611_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 59, - "y": 249, - "w": 27, - "h": 23 - } - }, - { - "filename": "596_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 30, - "h": 24 - }, - "frame": { - "x": 61, - "y": 74, - "w": 30, - "h": 24 - } - }, - { - "filename": "596_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 30, - "h": 24 - }, - "frame": { - "x": 60, - "y": 98, - "w": 30, - "h": 24 - } - }, - { - "filename": "612_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 61, - "y": 122, - "w": 28, - "h": 26 - } - }, - { - "filename": "593-f_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 29, - "h": 24 - }, - "frame": { - "x": 61, - "y": 148, - "w": 29, - "h": 24 - } - }, - { - "filename": "612_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 60, - "y": 172, - "w": 28, - "h": 26 - } - }, - { - "filename": "634_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 60, - "y": 198, - "w": 28, - "h": 24 - } - }, - { - "filename": "586-spring_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 26 - }, - "frame": { - "x": 64, - "y": 222, - "w": 25, - "h": 26 - } - }, - { - "filename": "634_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 86, - "y": 248, - "w": 28, - "h": 24 - } - }, - { - "filename": "586-summer_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 26 - }, - "frame": { - "x": 89, - "y": 122, - "w": 25, - "h": 26 - } - }, - { - "filename": "620_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 90, - "y": 98, - "w": 27, - "h": 24 - } - }, - { - "filename": "586-winter_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 26 - }, - "frame": { - "x": 90, - "y": 148, - "w": 25, - "h": 26 - } - }, - { - "filename": "620_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 88, - "y": 174, - "w": 27, - "h": 24 - } - }, - { - "filename": "547_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 88, - "y": 198, - "w": 23, - "h": 24 - } - }, - { - "filename": "649-burn_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 89, - "y": 222, - "w": 24, - "h": 26 - } - }, - { - "filename": "547_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 24 - }, - "frame": { - "x": 111, - "y": 198, - "w": 23, - "h": 24 - } - }, - { - "filename": "649-burn_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 113, - "y": 222, - "w": 24, - "h": 26 - } - }, - { - "filename": "585-autumn_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 114, - "y": 248, - "w": 20, - "h": 24 - } - }, - { - "filename": "585-spring_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 134, - "y": 248, - "w": 20, - "h": 24 - } - }, - { - "filename": "649-chill_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 114, - "y": 122, - "w": 24, - "h": 26 - } - }, - { - "filename": "649-chill_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 115, - "y": 148, - "w": 24, - "h": 26 - } - }, - { - "filename": "585-summer_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 115, - "y": 174, - "w": 20, - "h": 24 - } - }, - { - "filename": "585-winter_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 20, - "h": 24 - }, - "frame": { - "x": 134, - "y": 198, - "w": 20, - "h": 24 - } - }, - { - "filename": "649-douse_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 137, - "y": 222, - "w": 24, - "h": 26 - } - }, - { - "filename": "542_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 154, - "y": 248, - "w": 16, - "h": 23 - } - }, - { - "filename": "649-douse_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 91, - "y": 50, - "w": 24, - "h": 26 - } - }, - { - "filename": "496_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 91, - "y": 76, - "w": 24, - "h": 22 - } - }, - { - "filename": "649-shock_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 115, - "y": 49, - "w": 24, - "h": 26 - } - }, - { - "filename": "649-shock_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 139, - "y": 49, - "w": 24, - "h": 26 - } - }, - { - "filename": "649_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 163, - "y": 49, - "w": 24, - "h": 26 - } - }, - { - "filename": "649_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 187, - "y": 49, - "w": 24, - "h": 26 - } - }, - { - "filename": "532_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 26, - "h": 21 - }, - "frame": { - "x": 115, - "y": 75, - "w": 26, - "h": 21 - } - }, - { - "filename": "532_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 8, - "w": 26, - "h": 21 - }, - "frame": { - "x": 141, - "y": 75, - "w": 26, - "h": 21 - } - }, - { - "filename": "496_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 22 - }, - "frame": { - "x": 167, - "y": 75, - "w": 24, - "h": 22 - } - }, - { - "filename": "560_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 117, - "y": 96, - "w": 22, - "h": 23 - } - }, - { - "filename": "560_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 139, - "y": 96, - "w": 22, - "h": 23 - } - }, - { - "filename": "560_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 23 - }, - "frame": { - "x": 191, - "y": 75, - "w": 22, - "h": 23 - } - }, - { - "filename": "572_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 21 - }, - "frame": { - "x": 138, - "y": 119, - "w": 24, - "h": 21 - } - }, - { - "filename": "648-pirouette_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 17, - "h": 25 - }, - "frame": { - "x": 211, - "y": 49, - "w": 17, - "h": 25 - } - }, - { - "filename": "572_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 21 - }, - "frame": { - "x": 228, - "y": 48, - "w": 24, - "h": 21 - } - }, - { - "filename": "610_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 252, - "y": 64, - "w": 20, - "h": 22 - } - }, - { - "filename": "562_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 228, - "y": 69, - "w": 24, - "h": 18 - } - }, - { - "filename": "607_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 20 - }, - "frame": { - "x": 213, - "y": 74, - "w": 15, - "h": 20 - } - }, - { - "filename": "610_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 22 - }, - "frame": { - "x": 252, - "y": 86, - "w": 20, - "h": 22 - } - }, - { - "filename": "562_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 18 - }, - "frame": { - "x": 228, - "y": 87, - "w": 24, - "h": 18 - } - }, - { - "filename": "592-f_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 - }, - "frame": { - "x": 161, - "y": 97, - "w": 21, - "h": 22 - } - }, - { - "filename": "592-f_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 - }, - "frame": { - "x": 162, - "y": 119, - "w": 21, - "h": 22 - } - }, - { - "filename": "592-f_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 - }, - "frame": { - "x": 139, - "y": 140, - "w": 21, - "h": 22 - } - }, - { - "filename": "592_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 - }, - "frame": { - "x": 160, - "y": 141, - "w": 21, - "h": 22 - } - }, - { - "filename": "632_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 11, - "w": 26, - "h": 18 - }, - "frame": { - "x": 182, - "y": 98, - "w": 26, - "h": 18 - } - }, - { - "filename": "592_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 22 - }, - "frame": { - "x": 183, - "y": 116, - "w": 21, - "h": 22 - } - }, - { - "filename": "608_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 21, - "h": 20 - }, - "frame": { - "x": 139, - "y": 162, - "w": 21, - "h": 20 - } - }, - { - "filename": "546_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 23, - "h": 16 - }, - "frame": { - "x": 135, - "y": 182, - "w": 23, - "h": 16 - } - }, - { - "filename": "495_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 22, - "h": 19 - }, - "frame": { - "x": 160, - "y": 163, - "w": 22, - "h": 19 - } - }, - { - "filename": "632_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 11, - "w": 26, - "h": 18 - }, - "frame": { - "x": 158, - "y": 182, - "w": 26, - "h": 18 - } - }, - { - "filename": "633_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 18, - "h": 22 - }, - "frame": { - "x": 154, - "y": 200, - "w": 18, - "h": 22 - } - }, - { - "filename": "648-pirouette_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 17, - "h": 25 - }, - "frame": { - "x": 161, - "y": 222, - "w": 17, - "h": 25 - } - }, - { - "filename": "633_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 18, - "h": 22 - }, - "frame": { - "x": 172, - "y": 200, - "w": 18, - "h": 22 - } - }, - { - "filename": "542_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 178, - "y": 222, - "w": 16, - "h": 23 - } - }, - { - "filename": "549_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 170, - "y": 247, - "w": 19, - "h": 23 - } - }, - { - "filename": "607_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 20 - }, - "frame": { - "x": 213, - "y": 94, - "w": 15, - "h": 20 - } - }, - { - "filename": "546_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 23, - "h": 16 - }, - "frame": { - "x": 228, - "y": 105, - "w": 23, - "h": 16 - } - }, - { - "filename": "619_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 20, - "h": 21 - }, - "frame": { - "x": 251, - "y": 108, - "w": 20, - "h": 21 - } - }, - { - "filename": "549_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 189, - "y": 245, - "w": 19, - "h": 23 - } - }, - { - "filename": "648-aria_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 204, - "y": 116, - "w": 16, - "h": 23 - } - }, - { - "filename": "595_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 23, - "h": 18 - }, - "frame": { - "x": 220, - "y": 121, - "w": 23, - "h": 18 - } - }, - { - "filename": "595_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 23, - "h": 18 - }, - "frame": { - "x": 243, - "y": 129, - "w": 23, - "h": 18 - } - }, - { - "filename": "578_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 181, - "y": 141, - "w": 18, - "h": 21 - } - }, - { - "filename": "622_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 20, - "h": 20 - }, - "frame": { - "x": 182, - "y": 162, - "w": 20, - "h": 20 - } - }, - { - "filename": "541_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 18 - }, - "frame": { - "x": 184, - "y": 182, - "w": 22, - "h": 18 - } - }, - { - "filename": "578_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 190, - "y": 200, - "w": 18, - "h": 21 - } - }, - { - "filename": "648-aria_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 - }, - "frame": { - "x": 194, - "y": 221, - "w": 16, - "h": 23 - } - }, - { - "filename": "495_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 22, - "h": 19 - }, - "frame": { - "x": 199, - "y": 139, - "w": 22, - "h": 19 - } - }, - { - "filename": "541_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 18 - }, - "frame": { - "x": 221, - "y": 139, - "w": 22, - "h": 18 - } - }, - { - "filename": "619_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 20, - "h": 21 - }, - "frame": { - "x": 202, - "y": 158, - "w": 20, - "h": 21 - } - }, - { - "filename": "622_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 20, - "h": 20 - }, - "frame": { - "x": 222, - "y": 157, - "w": 20, - "h": 20 - } - }, - { - "filename": "578_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 21 - }, - "frame": { - "x": 206, - "y": 179, - "w": 18, - "h": 21 - } - }, - { - "filename": "540_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 19 - }, - "frame": { - "x": 208, - "y": 200, - "w": 17, - "h": 19 - } - }, - { - "filename": "570_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 224, - "y": 177, - "w": 18, - "h": 19 - } - }, - { - "filename": "540_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 17, - "h": 19 - }, - "frame": { - "x": 210, - "y": 219, - "w": 17, - "h": 19 - } - }, - { - "filename": "570_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 225, - "y": 196, - "w": 18, - "h": 19 - } - }, - { - "filename": "559_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 18 - }, - "frame": { - "x": 227, - "y": 215, - "w": 17, - "h": 18 - } - }, - { - "filename": "559_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 18 - }, - "frame": { - "x": 243, - "y": 147, - "w": 17, - "h": 18 - } - }, - { - "filename": "559_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 18 - }, - "frame": { - "x": 242, - "y": 165, - "w": 17, - "h": 18 - } - }, - { - "filename": "577_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 - }, - "frame": { - "x": 210, - "y": 238, - "w": 17, - "h": 16 - } - }, - { - "filename": "577_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 - }, - "frame": { - "x": 227, - "y": 233, - "w": 17, - "h": 16 - } - }, - { - "filename": "577_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 17, - "h": 16 - }, - "frame": { - "x": 208, - "y": 254, - "w": 17, - "h": 16 + "h": 28 } } ] @@ -2619,6 +2199,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:24ea1dac6045488ae494c823830dafeb:81a3cab776b5ac69aa1c6880e2c763f5:f1931bc28ee7f32dba7543723757cf2a$" + "smartupdate": "$TexturePacker:SmartUpdate:de1dbfe98d4dd5e2d2db7980eb5dd9bf:651ee9350734455856518a839d035ba3:f1931bc28ee7f32dba7543723757cf2a$" } } diff --git a/public/images/pokemon_icons_5v.png b/public/images/pokemon_icons_5v.png index 3723e1d934f..6db34b169d3 100644 Binary files a/public/images/pokemon_icons_5v.png and b/public/images/pokemon_icons_5v.png differ diff --git a/public/images/pokemon_icons_6v.json b/public/images/pokemon_icons_6v.json index 8eec322249d..663505673ed 100644 --- a/public/images/pokemon_icons_6v.json +++ b/public/images/pokemon_icons_6v.json @@ -4,13 +4,13 @@ "image": "pokemon_icons_6v.png", "format": "RGBA8888", "size": { - "w": 250, - "h": 250 + "w": 255, + "h": 225 }, "scale": 1, "frames": [ { - "filename": "720-unbound_1", + "filename": "704_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -18,20 +18,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 29 + "x": 14, + "y": 14, + "w": 12, + "h": 14 }, "frame": { "x": 0, "y": 0, - "w": 40, - "h": 29 + "w": 12, + "h": 14 } }, { - "filename": "720-unbound_2", + "filename": "704_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -39,1406 +39,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 29 + "x": 14, + "y": 14, + "w": 12, + "h": 14 }, "frame": { - "x": 0, - "y": 29, - "w": 40, - "h": 29 - } - }, - { - "filename": "720-unbound_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 40, - "h": 29 - }, - "frame": { - "x": 40, + "x": 12, "y": 0, - "w": 40, - "h": 29 + "w": 12, + "h": 14 } }, { - "filename": "716-active_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 31, - "h": 30 - }, - "frame": { - "x": 0, - "y": 58, - "w": 31, - "h": 30 - } - }, - { - "filename": "716-active_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 31, - "h": 30 - }, - "frame": { - "x": 0, - "y": 88, - "w": 31, - "h": 30 - } - }, - { - "filename": "716-neutral_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 31, - "h": 30 - }, - "frame": { - "x": 0, - "y": 118, - "w": 31, - "h": 30 - } - }, - { - "filename": "716-neutral_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 31, - "h": 30 - }, - "frame": { - "x": 0, - "y": 148, - "w": 31, - "h": 30 - } - }, - { - "filename": "717_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 32, - "h": 28 - }, - "frame": { - "x": 40, - "y": 29, - "w": 32, - "h": 28 - } - }, - { - "filename": "717_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 32, - "h": 28 - }, - "frame": { - "x": 80, - "y": 0, - "w": 32, - "h": 28 - } - }, - { - "filename": "691_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 34, - "h": 25 - }, - "frame": { - "x": 112, - "y": 0, - "w": 34, - "h": 25 - } - }, - { - "filename": "691_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 34, - "h": 25 - }, - "frame": { - "x": 146, - "y": 0, - "w": 34, - "h": 25 - } - }, - { - "filename": "697_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 32, - "h": 24 - }, - "frame": { - "x": 180, - "y": 0, - "w": 32, - "h": 24 - } - }, - { - "filename": "697_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 32, - "h": 24 - }, - "frame": { - "x": 212, - "y": 0, - "w": 32, - "h": 24 - } - }, - { - "filename": "666-archipelago_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 0, - "y": 178, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-archipelago_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 0, - "y": 205, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-continental_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 31, - "y": 58, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-continental_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 31, - "y": 85, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-elegant_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 31, - "y": 112, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-elegant_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 31, - "y": 139, - "w": 28, - "h": 27 - } - }, - { - "filename": "655_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 31, - "y": 166, - "w": 29, - "h": 25 - } - }, - { - "filename": "666-fancy_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 28, - "y": 191, - "w": 28, - "h": 27 - } - }, - { - "filename": "655_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 29, - "h": 25 - }, - "frame": { - "x": 28, - "y": 218, - "w": 29, - "h": 25 - } - }, - { - "filename": "666-fancy_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 59, - "y": 57, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-garden_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 59, - "y": 84, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-garden_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 59, - "y": 111, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-high-plains_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 59, - "y": 138, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-high-plains_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 60, - "y": 165, - "w": 28, - "h": 27 - } - }, - { - "filename": "706_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 26 - }, - "frame": { - "x": 56, - "y": 192, - "w": 26, - "h": 26 - } - }, - { - "filename": "666-icy-snow_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 57, - "y": 218, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-icy-snow_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 72, - "y": 29, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-jungle_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 87, - "y": 56, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-jungle_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 87, - "y": 83, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-marine_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 87, - "y": 110, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-marine_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 87, - "y": 137, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-meadow_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 88, - "y": 164, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-meadow_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 100, - "y": 28, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-modern_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 128, - "y": 25, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-modern_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 156, - "y": 25, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-monsoon_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 184, - "y": 24, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-monsoon_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 212, - "y": 24, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-ocean_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 115, - "y": 55, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-ocean_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 115, - "y": 82, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-poke-ball_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 115, - "y": 109, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-poke-ball_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 115, - "y": 136, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-polar_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 116, - "y": 163, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-polar_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 143, - "y": 52, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-river_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 143, - "y": 79, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-river_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 143, - "y": 106, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-sandstorm_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 143, - "y": 133, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-sandstorm_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 144, - "y": 160, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-savanna_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 171, - "y": 52, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-savanna_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 171, - "y": 79, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-sun_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 171, - "y": 106, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-sun_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 171, - "y": 133, - "w": 28, - "h": 27 - } - }, - { - "filename": "666-tundra_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 199, - "y": 51, - "w": 28, - "h": 27 - } - }, - { - "filename": "711_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 227, - "y": 51, - "w": 23, - "h": 25 - } - }, - { - "filename": "666-tundra_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 199, - "y": 78, - "w": 28, - "h": 27 - } - }, - { - "filename": "711_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 227, - "y": 76, - "w": 23, - "h": 25 - } - }, - { - "filename": "709_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 27, - "h": 27 - }, - "frame": { - "x": 172, - "y": 160, - "w": 27, - "h": 27 - } - }, - { - "filename": "709_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 27, - "h": 27 - }, - "frame": { - "x": 199, - "y": 105, - "w": 27, - "h": 27 - } - }, - { - "filename": "706_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 26 - }, - "frame": { - "x": 199, - "y": 132, - "w": 26, - "h": 26 - } - }, - { - "filename": "711_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 227, - "y": 101, - "w": 23, - "h": 25 - } - }, - { - "filename": "700_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 226, - "y": 126, - "w": 24, - "h": 25 - } - }, - { - "filename": "700_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 199, - "y": 158, - "w": 24, - "h": 25 - } - }, - { - "filename": "708_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 223, - "y": 158, - "w": 27, - "h": 23 - } - }, - { - "filename": "708_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 223, - "y": 181, - "w": 27, - "h": 23 - } - }, - { - "filename": "654_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 82, - "y": 192, - "w": 22, - "h": 24 - } - }, - { - "filename": "654_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 85, - "y": 216, - "w": 22, - "h": 24 - } - }, - { - "filename": "705_2", + "filename": "665_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1447,82 +61,19 @@ }, "spriteSourceSize": { "x": 12, - "y": 5, - "w": 17, - "h": 24 + "y": 11, + "w": 16, + "h": 17 }, "frame": { - "x": 104, - "y": 191, - "w": 17, - "h": 24 + "x": 24, + "y": 0, + "w": 16, + "h": 17 } }, { - "filename": "720_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 121, - "y": 190, - "w": 23, - "h": 21 - } - }, - { - "filename": "720_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 144, - "y": 187, - "w": 23, - "h": 21 - } - }, - { - "filename": "720_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 167, - "y": 187, - "w": 23, - "h": 21 - } - }, - { - "filename": "705_3", + "filename": "665_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1531,57 +82,15 @@ }, "spriteSourceSize": { "x": 12, - "y": 5, - "w": 17, - "h": 24 + "y": 11, + "w": 16, + "h": 17 }, "frame": { - "x": 107, - "y": 215, - "w": 17, - "h": 24 - } - }, - { - "filename": "690_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 23 - }, - "frame": { - "x": 124, - "y": 211, - "w": 20, - "h": 23 - } - }, - { - "filename": "690_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 23 - }, - "frame": { - "x": 144, - "y": 208, - "w": 20, - "h": 23 + "x": 40, + "y": 0, + "w": 16, + "h": 17 } }, { @@ -1593,15 +102,183 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 56, + "y": 0, + "w": 20, + "h": 17 + } + }, + { + "filename": "696_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 76, + "y": 0, + "w": 20, + "h": 17 + } + }, + { + "filename": "653_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 17, "h": 19 }, "frame": { - "x": 144, - "y": 231, - "w": 22, + "x": 96, + "y": 0, + "w": 17, + "h": 19 + } + }, + { + "filename": "653_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 113, + "y": 0, + "w": 17, + "h": 19 + } + }, + { + "filename": "710_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 130, + "y": 0, + "w": 17, + "h": 19 + } + }, + { + "filename": "710_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 147, + "y": 0, + "w": 17, + "h": 19 + } + }, + { + "filename": "720_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 19 + }, + "frame": { + "x": 164, + "y": 0, + "w": 21, + "h": 19 + } + }, + { + "filename": "720_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 19 + }, + "frame": { + "x": 185, + "y": 0, + "w": 21, + "h": 19 + } + }, + { + "filename": "720_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 19 + }, + "frame": { + "x": 206, + "y": 0, + "w": 21, "h": 19 } }, @@ -1614,37 +291,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 16, - "h": 23 + "x": 13, + "y": 7, + "w": 14, + "h": 21 }, "frame": { - "x": 164, - "y": 208, - "w": 16, - "h": 23 - } - }, - { - "filename": "696_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 19 - }, - "frame": { - "x": 166, - "y": 231, - "w": 22, - "h": 19 + "x": 227, + "y": 0, + "w": 14, + "h": 21 } }, { @@ -1656,41 +312,125 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 13, + "y": 7, + "w": 14, + "h": 21 + }, + "frame": { + "x": 241, + "y": 0, + "w": 14, + "h": 21 + } + }, + { + "filename": "690_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 0, + "y": 14, + "w": 18, + "h": 21 + } + }, + { + "filename": "690_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 18, + "h": 21 + }, + "frame": { + "x": 18, + "y": 17, + "w": 18, + "h": 21 + } + }, + { + "filename": "708_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 36, + "y": 17, + "w": 25, + "h": 21 + } + }, + { + "filename": "708_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 61, + "y": 17, + "w": 25, + "h": 21 + } + }, + { + "filename": "654_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 6, - "w": 16, - "h": 23 + "w": 20, + "h": 22 }, "frame": { - "x": 180, - "y": 208, - "w": 16, - "h": 23 + "x": 86, + "y": 19, + "w": 20, + "h": 22 } }, { - "filename": "665_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 188, - "y": 231, - "w": 18, - "h": 19 - } - }, - { - "filename": "653_2", + "filename": "654_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1699,19 +439,61 @@ }, "spriteSourceSize": { "x": 10, - "y": 8, - "w": 19, - "h": 21 + "y": 6, + "w": 20, + "h": 22 }, "frame": { - "x": 190, - "y": 187, - "w": 19, - "h": 21 + "x": 106, + "y": 19, + "w": 20, + "h": 22 } }, { - "filename": "704_2", + "filename": "697_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 22 + }, + "frame": { + "x": 126, + "y": 19, + "w": 30, + "h": 22 + } + }, + { + "filename": "697_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 30, + "h": 22 + }, + "frame": { + "x": 156, + "y": 19, + "w": 30, + "h": 22 + } + }, + { + "filename": "705_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1720,19 +502,103 @@ }, "spriteSourceSize": { "x": 13, - "y": 13, - "w": 14, - "h": 16 + "y": 6, + "w": 15, + "h": 22 }, "frame": { - "x": 209, - "y": 183, - "w": 14, - "h": 16 + "x": 186, + "y": 19, + "w": 15, + "h": 22 } }, { - "filename": "653_3", + "filename": "705_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 6, + "w": 15, + "h": 22 + }, + "frame": { + "x": 201, + "y": 19, + "w": 15, + "h": 22 + } + }, + { + "filename": "655_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 216, + "y": 21, + "w": 27, + "h": 23 + } + }, + { + "filename": "655_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 0, + "y": 38, + "w": 27, + "h": 23 + } + }, + { + "filename": "691_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 32, + "h": 23 + }, + "frame": { + "x": 27, + "y": 38, + "w": 32, + "h": 23 + } + }, + { + "filename": "700_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1741,19 +607,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 8, - "w": 19, - "h": 21 + "y": 5, + "w": 22, + "h": 23 }, "frame": { - "x": 196, - "y": 208, - "w": 19, - "h": 21 + "x": 59, + "y": 38, + "w": 22, + "h": 23 } }, { - "filename": "710_2", + "filename": "691_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1761,20 +627,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 19, - "h": 21 + "x": 6, + "y": 5, + "w": 32, + "h": 23 }, "frame": { - "x": 206, - "y": 229, - "w": 19, - "h": 21 + "x": 81, + "y": 41, + "w": 32, + "h": 23 } }, { - "filename": "704_3", + "filename": "700_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1782,20 +648,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 13, - "w": 14, - "h": 16 + "x": 10, + "y": 5, + "w": 22, + "h": 23 }, "frame": { - "x": 124, - "y": 234, - "w": 14, - "h": 16 + "x": 113, + "y": 41, + "w": 22, + "h": 23 } }, { - "filename": "710_3", + "filename": "711_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1803,20 +669,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 19, - "h": 21 + "x": 10, + "y": 5, + "w": 21, + "h": 23 }, "frame": { - "x": 215, - "y": 204, - "w": 19, - "h": 21 + "x": 135, + "y": 41, + "w": 21, + "h": 23 } }, { - "filename": "665_3", + "filename": "711_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1824,16 +690,1150 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 + "x": 10, + "y": 5, + "w": 21, + "h": 23 }, "frame": { - "x": 225, - "y": 225, - "w": 18, - "h": 19 + "x": 156, + "y": 41, + "w": 21, + "h": 23 + } + }, + { + "filename": "711_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 177, + "y": 41, + "w": 21, + "h": 23 + } + }, + { + "filename": "706_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 198, + "y": 44, + "w": 24, + "h": 24 + } + }, + { + "filename": "706_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 24 + }, + "frame": { + "x": 222, + "y": 44, + "w": 24, + "h": 24 + } + }, + { + "filename": "666-archipelago_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 61, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-archipelago_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 26, + "y": 61, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-continental_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 52, + "y": 61, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-continental_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 78, + "y": 64, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-elegant_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 104, + "y": 64, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-elegant_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 130, + "y": 64, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-fancy_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 156, + "y": 64, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-fancy_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 182, + "y": 68, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-garden_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 208, + "y": 68, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-garden_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 86, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-high-plains_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 26, + "y": 86, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-high-plains_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 52, + "y": 86, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-icy-snow_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 78, + "y": 89, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-icy-snow_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 104, + "y": 89, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-jungle_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 130, + "y": 89, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-jungle_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 156, + "y": 89, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-marine_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 182, + "y": 93, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-marine_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 208, + "y": 93, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-meadow_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 111, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-meadow_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 26, + "y": 111, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-modern_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 52, + "y": 111, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-modern_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 78, + "y": 114, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-monsoon_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 104, + "y": 114, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-monsoon_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 130, + "y": 114, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-ocean_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 156, + "y": 114, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-ocean_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 182, + "y": 118, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-poke-ball_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 208, + "y": 118, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-poke-ball_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 136, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-polar_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 26, + "y": 136, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-polar_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 52, + "y": 136, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-river_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 78, + "y": 139, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-river_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 104, + "y": 139, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sandstorm_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 130, + "y": 139, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sandstorm_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 156, + "y": 139, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-savanna_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 182, + "y": 143, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-savanna_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 208, + "y": 143, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sun_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 161, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sun_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 26, + "y": 161, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-tundra_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 52, + "y": 161, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-tundra_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 78, + "y": 164, + "w": 26, + "h": 25 + } + }, + { + "filename": "709_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 104, + "y": 164, + "w": 25, + "h": 25 + } + }, + { + "filename": "709_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 129, + "y": 164, + "w": 25, + "h": 25 + } + }, + { + "filename": "717_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 30, + "h": 27 + }, + "frame": { + "x": 154, + "y": 168, + "w": 30, + "h": 27 + } + }, + { + "filename": "717_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 30, + "h": 27 + }, + "frame": { + "x": 184, + "y": 168, + "w": 30, + "h": 27 + } + }, + { + "filename": "720-unbound_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 2, + "w": 38, + "h": 28 + }, + "frame": { + "x": 214, + "y": 168, + "w": 38, + "h": 28 + } + }, + { + "filename": "720-unbound_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 2, + "w": 38, + "h": 28 + }, + "frame": { + "x": 0, + "y": 186, + "w": 38, + "h": 28 + } + }, + { + "filename": "720-unbound_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 2, + "w": 38, + "h": 28 + }, + "frame": { + "x": 38, + "y": 186, + "w": 38, + "h": 28 + } + }, + { + "filename": "716-active_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 76, + "y": 189, + "w": 29, + "h": 30 + } + }, + { + "filename": "716-active_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 105, + "y": 189, + "w": 29, + "h": 30 + } + }, + { + "filename": "716-neutral_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 134, + "y": 195, + "w": 29, + "h": 30 + } + }, + { + "filename": "716-neutral_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 163, + "y": 195, + "w": 29, + "h": 30 } } ] @@ -1842,6 +1842,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:ca2a93c5f2785359b416247cb077101c:efd51fc9ab40c64a5ed6d22c8b428bcc:8a74f769af240f74b0e67390bbb36c14$" + "smartupdate": "$TexturePacker:SmartUpdate:8e8c045c88dcb166770f1b7b2da98f5b:efd51fc9ab40c64a5ed6d22c8b428bcc:8a74f769af240f74b0e67390bbb36c14$" } } diff --git a/public/images/pokemon_icons_6v.png b/public/images/pokemon_icons_6v.png index c3c7b41551f..edbc9e41d77 100644 Binary files a/public/images/pokemon_icons_6v.png and b/public/images/pokemon_icons_6v.png differ diff --git a/public/images/pokemon_icons_7v.json b/public/images/pokemon_icons_7v.json index 7f56c3781f4..81513afb251 100644 --- a/public/images/pokemon_icons_7v.json +++ b/public/images/pokemon_icons_7v.json @@ -4,51 +4,975 @@ "image": "pokemon_icons_7v.png", "format": "RGBA8888", "size": { - "w": 203, - "h": 203 + "w": 255, + "h": 152 }, "scale": 1, "frames": [ { - "filename": "809_2", + "filename": "767_2", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 40, "h": 30 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 + "x": 10, + "y": 11, + "w": 24, + "h": 14 }, "frame": { "x": 0, "y": 0, - "w": 40, - "h": 30 + "w": 24, + "h": 14 } }, { - "filename": "809_3", + "filename": "767_3", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 40, "h": 30 }, "spriteSourceSize": { - "x": 0, + "x": 10, + "y": 11, + "w": 24, + "h": 14 + }, + "frame": { + "x": 24, "y": 0, + "w": 24, + "h": 14 + } + }, + { + "filename": "808_2", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 40, "h": 30 }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, "frame": { - "x": 0, - "y": 30, + "x": 48, + "y": 0, + "w": 17, + "h": 17 + } + }, + { + "filename": "808_3", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 40, "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 65, + "y": 0, + "w": 17, + "h": 17 + } + }, + { + "filename": "753_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 14, + "h": 19 + }, + "frame": { + "x": 82, + "y": 0, + "w": 14, + "h": 19 + } + }, + { + "filename": "753_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 14, + "h": 19 + }, + "frame": { + "x": 96, + "y": 0, + "w": 14, + "h": 19 + } + }, + { + "filename": "761_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 110, + "y": 0, + "w": 16, + "h": 19 + } + }, + { + "filename": "761_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 126, + "y": 0, + "w": 16, + "h": 19 + } + }, + { + "filename": "790_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 142, + "y": 0, + "w": 21, + "h": 19 + } + }, + { + "filename": "790_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 163, + "y": 0, + "w": 21, + "h": 19 + } + }, + { + "filename": "728_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 184, + "y": 0, + "w": 17, + "h": 20 + } + }, + { + "filename": "728_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 201, + "y": 0, + "w": 17, + "h": 20 + } + }, + { + "filename": "747_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 218, + "y": 0, + "w": 22, + "h": 20 + } + }, + { + "filename": "755_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 13, + "h": 24 + }, + "frame": { + "x": 240, + "y": 0, + "w": 13, + "h": 24 + } + }, + { + "filename": "747_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 0, + "y": 14, + "w": 22, + "h": 20 + } + }, + { + "filename": "789_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 22, + "y": 14, + "w": 23, + "h": 20 + } + }, + { + "filename": "789_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 45, + "y": 17, + "w": 23, + "h": 20 + } + }, + { + "filename": "789_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 68, + "y": 19, + "w": 23, + "h": 20 + } + }, + { + "filename": "754_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 91, + "y": 19, + "w": 20, + "h": 22 + } + }, + { + "filename": "754_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 111, + "y": 19, + "w": 20, + "h": 22 + } + }, + { + "filename": "762_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 18, + "h": 23 + }, + "frame": { + "x": 131, + "y": 19, + "w": 18, + "h": 23 + } + }, + { + "filename": "762_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 18, + "h": 23 + }, + "frame": { + "x": 149, + "y": 19, + "w": 18, + "h": 23 + } + }, + { + "filename": "755_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 13, + "h": 24 + }, + "frame": { + "x": 167, + "y": 19, + "w": 13, + "h": 24 + } + }, + { + "filename": "768_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 180, + "y": 20, + "w": 24, + "h": 23 + } + }, + { + "filename": "768_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 204, + "y": 20, + "w": 24, + "h": 23 + } + }, + { + "filename": "729_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 228, + "y": 24, + "w": 23, + "h": 24 + } + }, + { + "filename": "729_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 23, + "h": 24 + }, + "frame": { + "x": 0, + "y": 34, + "w": 23, + "h": 24 + } + }, + { + "filename": "756_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 23, + "y": 34, + "w": 22, + "h": 24 + } + }, + { + "filename": "756_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 45, + "y": 37, + "w": 22, + "h": 24 + } + }, + { + "filename": "763_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 67, + "y": 39, + "w": 21, + "h": 24 + } + }, + { + "filename": "763_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 88, + "y": 41, + "w": 21, + "h": 24 + } + }, + { + "filename": "793_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 109, + "y": 41, + "w": 21, + "h": 24 + } + }, + { + "filename": "793_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 130, + "y": 42, + "w": 21, + "h": 24 + } + }, + { + "filename": "802_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 151, + "y": 43, + "w": 22, + "h": 24 + } + }, + { + "filename": "802_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 173, + "y": 43, + "w": 22, + "h": 24 + } + }, + { + "filename": "802_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 195, + "y": 43, + "w": 22, + "h": 24 + } + }, + { + "filename": "748_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 25 + }, + "frame": { + "x": 217, + "y": 48, + "w": 26, + "h": 25 + } + }, + { + "filename": "748_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 26, + "h": 25 + }, + "frame": { + "x": 0, + "y": 58, + "w": 26, + "h": 25 + } + }, + { + "filename": "730_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 26, + "y": 61, + "w": 28, + "h": 27 + } + }, + { + "filename": "730_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 54, + "y": 63, + "w": 28, + "h": 27 + } + }, + { + "filename": "791_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 29, + "h": 28 + }, + "frame": { + "x": 82, + "y": 65, + "w": 29, + "h": 28 + } + }, + { + "filename": "791_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 29, + "h": 28 + }, + "frame": { + "x": 111, + "y": 66, + "w": 29, + "h": 28 + } + }, + { + "filename": "791_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 29, + "h": 28 + }, + "frame": { + "x": 140, + "y": 67, + "w": 29, + "h": 28 + } + }, + { + "filename": "792_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 169, + "y": 67, + "w": 28, + "h": 28 + } + }, + { + "filename": "792_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 197, + "y": 73, + "w": 28, + "h": 28 + } + }, + { + "filename": "809-gigantamax_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 28 + }, + "frame": { + "x": 225, + "y": 73, + "w": 30, + "h": 28 } }, { @@ -60,16 +984,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 30 + "x": 3, + "y": 1, + "w": 35, + "h": 28 }, "frame": { - "x": 40, - "y": 0, - "w": 37, - "h": 30 + "x": 0, + "y": 88, + "w": 35, + "h": 28 } }, { @@ -81,20 +1005,62 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 37, - "h": 30 + "x": 3, + "y": 1, + "w": 35, + "h": 28 }, "frame": { + "x": 35, + "y": 90, + "w": 35, + "h": 28 + } + }, + { + "filename": "809-gigantamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 28 + }, + "frame": { + "x": 70, + "y": 93, + "w": 30, + "h": 28 + } + }, + { + "filename": "809_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { "x": 0, - "y": 60, - "w": 37, - "h": 30 + "y": 1, + "w": 40, + "h": 28 + }, + "frame": { + "x": 100, + "y": 94, + "w": 40, + "h": 28 } }, { - "filename": "800-dusk-mane_2", + "filename": "809_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -102,37 +1068,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 36, - "h": 30 - }, - "frame": { - "x": 40, - "y": 30, - "w": 36, - "h": 30 - } - }, - { - "filename": "800-dusk-mane_3", - "rotated": false, - "trimmed": true, - "sourceSize": { + "x": 0, + "y": 1, "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 36, - "h": 30 + "h": 28 }, "frame": { - "x": 77, - "y": 0, - "w": 36, - "h": 30 + "x": 140, + "y": 95, + "w": 40, + "h": 28 } }, { @@ -144,15 +1089,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, "y": 0, - "w": 33, + "w": 31, "h": 30 }, "frame": { - "x": 0, - "y": 90, - "w": 33, + "x": 180, + "y": 101, + "w": 31, "h": 30 } }, @@ -164,147 +1109,42 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 33, - "h": 30 - }, - "frame": { - "x": 37, - "y": 60, - "w": 33, - "h": 30 - } - }, - { - "filename": "809-gigantamax_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 29 - }, - "frame": { - "x": 76, - "y": 30, - "w": 32, - "h": 29 - } - }, - { - "filename": "809-gigantamax_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 29 - }, - "frame": { - "x": 113, - "y": 0, - "w": 32, - "h": 29 - } - }, - { - "filename": "791_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 31, - "h": 29 - }, - "frame": { - "x": 0, - "y": 120, - "w": 31, - "h": 29 - } - }, - { - "filename": "791_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 31, - "h": 29 - }, - "frame": { - "x": 33, - "y": 90, - "w": 31, - "h": 29 - } - }, - { - "filename": "791_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 31, - "h": 29 - }, - "frame": { - "x": 145, - "y": 0, - "w": 31, - "h": 29 - } - }, - { - "filename": "792_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 5, "y": 0, - "w": 30, + "w": 31, + "h": 30 + }, + "frame": { + "x": 211, + "y": 101, + "w": 31, + "h": 30 + } + }, + { + "filename": "800-dusk-mane_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 34, "h": 30 }, "frame": { "x": 0, - "y": 149, - "w": 30, + "y": 116, + "w": 34, "h": 30 } }, { - "filename": "754_2", + "filename": "800-dusk-mane_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -312,123 +1152,18 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 0, - "y": 179, - "w": 22, - "h": 24 - } - }, - { - "filename": "754_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 - }, - "frame": { - "x": 22, - "y": 179, - "w": 22, - "h": 24 - } - }, - { - "filename": "729_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 25, - "h": 26 - }, - "frame": { - "x": 176, + "x": 3, "y": 0, - "w": 25, - "h": 26 - } - }, - { - "filename": "792_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 30, + "w": 34, "h": 30 }, "frame": { - "x": 30, - "y": 149, - "w": 30, + "x": 34, + "y": 118, + "w": 34, "h": 30 } }, - { - "filename": "730_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 30, - "h": 29 - }, - "frame": { - "x": 31, - "y": 120, - "w": 30, - "h": 29 - } - }, - { - "filename": "728_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 19, - "h": 22 - }, - "frame": { - "x": 44, - "y": 179, - "w": 19, - "h": 22 - } - }, { "filename": "800_2", "rotated": false, @@ -438,39 +1173,18 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 0, - "w": 30, + "w": 28, "h": 30 }, "frame": { - "x": 70, - "y": 60, - "w": 30, + "x": 68, + "y": 121, + "w": 28, "h": 30 } }, - { - "filename": "730_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 30, - "h": 29 - }, - "frame": { - "x": 64, - "y": 90, - "w": 30, - "h": 29 - } - }, { "filename": "800_3", "rotated": false, @@ -480,772 +1194,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 7, "y": 0, - "w": 30, - "h": 30 - }, - "frame": { - "x": 61, - "y": 119, - "w": 30, - "h": 30 - } - }, - { - "filename": "748_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, "w": 28, - "h": 26 - }, - "frame": { - "x": 60, - "y": 149, - "w": 28, - "h": 26 - } - }, - { - "filename": "729_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 25, - "h": 26 - }, "frame": { - "x": 63, - "y": 175, - "w": 25, - "h": 26 - } - }, - { - "filename": "748_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 26 - }, - "frame": { - "x": 100, - "y": 59, - "w": 28, - "h": 26 - } - }, - { - "filename": "755_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 3, - "w": 15, - "h": 26 - }, - "frame": { - "x": 94, - "y": 90, - "w": 15, - "h": 26 - } - }, - { - "filename": "756_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 109, - "y": 85, - "w": 24, - "h": 26 - } - }, - { - "filename": "755_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 3, - "w": 15, - "h": 26 - }, - "frame": { - "x": 108, - "y": 30, - "w": 15, - "h": 26 - } - }, - { - "filename": "768_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 123, - "y": 29, - "w": 26, - "h": 25 - } - }, - { - "filename": "768_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 149, - "y": 29, - "w": 26, - "h": 25 - } - }, - { - "filename": "756_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 128, - "y": 54, - "w": 24, - "h": 26 - } - }, - { - "filename": "763_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 23, - "h": 26 - }, - "frame": { - "x": 152, - "y": 54, - "w": 23, - "h": 26 - } - }, - { - "filename": "802_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 24, - "h": 26 - }, - "frame": { - "x": 133, - "y": 80, - "w": 24, - "h": 26 - } - }, - { - "filename": "763_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 23, - "h": 26 - }, - "frame": { - "x": 157, - "y": 80, - "w": 23, - "h": 26 - } - }, - { - "filename": "793_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 23, - "h": 26 - }, - "frame": { - "x": 180, - "y": 26, - "w": 23, - "h": 26 - } - }, - { - "filename": "793_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 23, - "h": 26 - }, - "frame": { - "x": 180, - "y": 52, - "w": 23, - "h": 26 - } - }, - { - "filename": "790_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 180, - "y": 78, - "w": 23, - "h": 21 - } - }, - { - "filename": "790_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 180, - "y": 99, - "w": 23, - "h": 21 - } - }, - { - "filename": "767_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 26, - "h": 16 - }, - "frame": { - "x": 133, - "y": 106, - "w": 26, - "h": 16 - } - }, - { - "filename": "747_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 109, - "y": 111, - "w": 24, - "h": 22 - } - }, - { - "filename": "761_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 91, - "y": 119, - "w": 18, - "h": 21 - } - }, - { - "filename": "767_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 26, - "h": 16 - }, - "frame": { - "x": 133, + "x": 96, "y": 122, - "w": 26, - "h": 16 - } - }, - { - "filename": "762_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, + "w": 28, "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 159, - "y": 106, - "w": 20, - "h": 25 - } - }, - { - "filename": "802_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 24, - "h": 26 - }, - "frame": { - "x": 179, - "y": 120, - "w": 24, - "h": 26 - } - }, - { - "filename": "762_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 - }, - "frame": { - "x": 159, - "y": 131, - "w": 20, - "h": 25 - } - }, - { - "filename": "802_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 24, - "h": 26 - }, - "frame": { - "x": 179, - "y": 146, - "w": 24, - "h": 26 - } - }, - { - "filename": "747_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 109, - "y": 133, - "w": 24, - "h": 22 - } - }, - { - "filename": "761_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 18, - "h": 21 - }, - "frame": { - "x": 91, - "y": 140, - "w": 18, - "h": 21 - } - }, - { - "filename": "789_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 25, - "h": 22 - }, - "frame": { - "x": 133, - "y": 138, - "w": 25, - "h": 22 - } - }, - { - "filename": "789_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 25, - "h": 22 - }, - "frame": { - "x": 88, - "y": 161, - "w": 25, - "h": 22 - } - }, - { - "filename": "808_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 19, - "h": 19 - }, - "frame": { - "x": 88, - "y": 183, - "w": 19, - "h": 19 - } - }, - { - "filename": "728_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 19, - "h": 22 - }, - "frame": { - "x": 113, - "y": 155, - "w": 19, - "h": 22 - } - }, - { - "filename": "789_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 25, - "h": 22 - }, - "frame": { - "x": 132, - "y": 160, - "w": 25, - "h": 22 - } - }, - { - "filename": "808_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 19, - "h": 19 - }, - "frame": { - "x": 113, - "y": 177, - "w": 19, - "h": 19 - } - }, - { - "filename": "753_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 16, - "h": 21 - }, - "frame": { - "x": 132, - "y": 182, - "w": 16, - "h": 21 - } - }, - { - "filename": "753_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 16, - "h": 21 - }, - "frame": { - "x": 148, - "y": 182, - "w": 16, - "h": 21 - } - }, - { - "filename": "771_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 20, - "h": 15 - }, - "frame": { - "x": 158, - "y": 156, - "w": 20, - "h": 15 - } - }, - { - "filename": "771_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 20, - "h": 15 - }, - "frame": { - "x": 164, - "y": 172, - "w": 20, - "h": 15 } } ] @@ -1254,6 +1212,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:88c4dfe006c42a33b57fd12b1e1cfa4a:0d8b06ed95f6eb24a7f379ad48e61048:d5975df27e1e94206a68aa1fd3c2c8d0$" + "smartupdate": "$TexturePacker:SmartUpdate:ec5102a9e88b19f64cb572769d39a3f0:9691824e7425ab150d8f2f2221794439:d5975df27e1e94206a68aa1fd3c2c8d0$" } } diff --git a/public/images/pokemon_icons_7v.png b/public/images/pokemon_icons_7v.png index fd300cc00fa..a2e3f14891a 100644 Binary files a/public/images/pokemon_icons_7v.png and b/public/images/pokemon_icons_7v.png differ diff --git a/public/images/pokemon_icons_8v.json b/public/images/pokemon_icons_8v.json index be71440e3f9..6249c89f0ce 100644 --- a/public/images/pokemon_icons_8v.json +++ b/public/images/pokemon_icons_8v.json @@ -4,559 +4,13 @@ "image": "pokemon_icons_8v.png", "format": "RGBA8888", "size": { - "w": 233, - "h": 233 + "w": 256, + "h": 191 }, "scale": 1, "frames": [ { - "filename": "890-eternamax_2", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - } - }, - { - "filename": "890-eternamax_3", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 30 - }, - "frame": { - "x": 0, - "y": 30, - "w": 40, - "h": 30 - } - }, - { - "filename": "851_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 30 - }, - "frame": { - "x": 40, - "y": 0, - "w": 39, - "h": 30 - } - }, - { - "filename": "851_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 39, - "h": 30 - }, - "frame": { - "x": 0, - "y": 60, - "w": 39, - "h": 30 - } - }, - { - "filename": "890_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 35, - "h": 30 - }, - "frame": { - "x": 40, - "y": 30, - "w": 35, - "h": 30 - } - }, - { - "filename": "890_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 35, - "h": 30 - }, - "frame": { - "x": 79, - "y": 0, - "w": 35, - "h": 30 - } - }, - { - "filename": "823-gigantamax_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 29 - }, - "frame": { - "x": 0, - "y": 90, - "w": 34, - "h": 29 - } - }, - { - "filename": "823-gigantamax_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 29 - }, - "frame": { - "x": 39, - "y": 60, - "w": 34, - "h": 29 - } - }, - { - "filename": "858-gigantamax_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 31, - "h": 30 - }, - "frame": { - "x": 75, - "y": 30, - "w": 31, - "h": 30 - } - }, - { - "filename": "858-gigantamax_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 31, - "h": 30 - }, - "frame": { - "x": 114, - "y": 0, - "w": 31, - "h": 30 - } - }, - { - "filename": "887_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 28 - }, - "frame": { - "x": 0, - "y": 119, - "w": 32, - "h": 28 - } - }, - { - "filename": "887_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 28 - }, - "frame": { - "x": 73, - "y": 60, - "w": 32, - "h": 28 - } - }, - { - "filename": "887_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 32, - "h": 28 - }, - "frame": { - "x": 106, - "y": 30, - "w": 32, - "h": 28 - } - }, - { - "filename": "823_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 29, - "h": 26 - }, - "frame": { - "x": 145, - "y": 0, - "w": 29, - "h": 26 - } - }, - { - "filename": "823_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 29, - "h": 26 - }, - "frame": { - "x": 0, - "y": 147, - "w": 29, - "h": 26 - } - }, - { - "filename": "901_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 174, - "y": 0, - "w": 30, - "h": 25 - } - }, - { - "filename": "4078_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 29, - "h": 25 - }, - "frame": { - "x": 204, - "y": 0, - "w": 29, - "h": 25 - } - }, - { - "filename": "6706_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 28, - "h": 27 - }, - "frame": { - "x": 0, - "y": 173, - "w": 28, - "h": 27 - } - }, - { - "filename": "6706_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 28, - "h": 27 - }, - "frame": { - "x": 0, - "y": 200, - "w": 28, - "h": 27 - } - }, - { - "filename": "903_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 23, - "h": 29 - }, - "frame": { - "x": 138, - "y": 30, - "w": 23, - "h": 29 - } - }, - { - "filename": "903_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 23, - "h": 29 - }, - "frame": { - "x": 161, - "y": 26, - "w": 23, - "h": 29 - } - }, - { - "filename": "901_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 184, - "y": 25, - "w": 30, - "h": 25 - } - }, - { - "filename": "877-hangry_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 214, - "y": 25, - "w": 19, - "h": 23 - } - }, - { - "filename": "877-hangry_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 214, - "y": 48, - "w": 19, - "h": 23 - } - }, - { - "filename": "4078_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 29, - "h": 25 - }, - "frame": { - "x": 184, - "y": 50, - "w": 29, - "h": 25 - } - }, - { - "filename": "4052_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 23 - }, - "frame": { - "x": 161, - "y": 55, - "w": 23, - "h": 23 - } - }, - { - "filename": "6570_2", + "filename": "872_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -565,19 +19,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 5, - "w": 20, - "h": 24 + "y": 8, + "w": 17, + "h": 14 }, "frame": { - "x": 213, - "y": 71, - "w": 20, - "h": 24 + "x": 0, + "y": 0, + "w": 17, + "h": 14 } }, { - "filename": "858_2", + "filename": "872_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -585,20 +39,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 + "x": 11, + "y": 8, + "w": 17, + "h": 14 + }, + "frame": { + "x": 17, + "y": 0, + "w": 17, + "h": 14 + } + }, + { + "filename": "872_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 14 }, "frame": { "x": 34, - "y": 90, - "w": 24, - "h": 27 + "y": 0, + "w": 17, + "h": 14 } }, { - "filename": "858_3", + "filename": "821_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -606,20 +81,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 + "x": 10, + "y": 7, + "w": 19, + "h": 16 }, "frame": { - "x": 58, - "y": 89, - "w": 24, - "h": 27 + "x": 51, + "y": 0, + "w": 19, + "h": 16 } }, { - "filename": "900_2", + "filename": "821_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -627,41 +102,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 27, - "h": 27 + "x": 10, + "y": 7, + "w": 19, + "h": 16 }, "frame": { - "x": 82, - "y": 88, - "w": 27, - "h": 27 + "x": 70, + "y": 0, + "w": 19, + "h": 16 } }, { - "filename": "886_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 184, - "y": 75, - "w": 28, - "h": 26 - } - }, - { - "filename": "830_2", + "filename": "4263_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -670,376 +124,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, - "w": 21, - "h": 25 - }, - "frame": { - "x": 212, - "y": 95, - "w": 21, - "h": 25 - } - }, - { - "filename": "886_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 106, - "y": 58, - "w": 28, - "h": 26 - } - }, - { - "filename": "900_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 27, - "h": 27 - }, - "frame": { - "x": 134, - "y": 59, - "w": 27, - "h": 27 - } - }, - { - "filename": "4052_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 23 - }, - "frame": { - "x": 161, - "y": 78, - "w": 23, - "h": 23 - } - }, - { - "filename": "836_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 109, - "y": 84, - "w": 24, - "h": 24 - } - }, - { - "filename": "886_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 133, - "y": 86, - "w": 28, - "h": 26 - } - }, - { - "filename": "873_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 161, - "y": 101, - "w": 27, - "h": 24 - } - }, - { - "filename": "836_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 188, - "y": 101, - "w": 24, - "h": 24 - } - }, - { - "filename": "830_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 25 - }, - "frame": { - "x": 212, - "y": 120, - "w": 21, - "h": 25 - } - }, - { - "filename": "822_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 109, - "y": 108, - "w": 24, - "h": 21 - } - }, - { - "filename": "873_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 133, - "y": 112, - "w": 27, - "h": 24 - } - }, - { - "filename": "873_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 82, - "y": 115, - "w": 27, - "h": 24 - } - }, - { - "filename": "857_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 58, - "y": 116, - "w": 24, - "h": 24 - } - }, - { - "filename": "857_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 34, - "y": 117, - "w": 24, - "h": 24 - } - }, - { - "filename": "822_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 109, - "y": 129, - "w": 24, - "h": 21 - } - }, - { - "filename": "6571_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 133, - "y": 136, - "w": 27, - "h": 25 - } - }, - { - "filename": "6571_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 27, - "h": 25 - }, - "frame": { - "x": 160, - "y": 125, - "w": 27, - "h": 25 - } - }, - { - "filename": "863_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, + "y": 7, "w": 22, - "h": 26 + "h": 16 }, "frame": { - "x": 187, - "y": 125, + "x": 89, + "y": 0, "w": 22, - "h": 26 + "h": 16 } }, { - "filename": "835_2", + "filename": "4263_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1047,16 +144,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 22 + "x": 9, + "y": 7, + "w": 22, + "h": 16 }, "frame": { - "x": 209, - "y": 145, - "w": 24, - "h": 22 + "x": 111, + "y": 0, + "w": 22, + "h": 16 } }, { @@ -1067,80 +164,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 19 - }, - "frame": { - "x": 160, - "y": 150, - "w": 26, - "h": 19 - } - }, - { - "filename": "850_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 8, - "y": 9, - "w": 23, - "h": 12 - }, - "frame": { - "x": 186, - "y": 151, - "w": 23, - "h": 12 - } - }, - { - "filename": "850_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 12 - }, - "frame": { - "x": 186, - "y": 163, - "w": 23, - "h": 12 - } - }, - { - "filename": "835_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, + "y": 6, "w": 24, - "h": 22 + "h": 17 }, "frame": { - "x": 209, - "y": 167, + "x": 133, + "y": 0, "w": 24, - "h": 22 + "h": 17 } }, { @@ -1152,58 +186,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 26, - "h": 19 + "x": 8, + "y": 6, + "w": 24, + "h": 17 }, "frame": { - "x": 32, - "y": 141, - "w": 26, - "h": 19 - } - }, - { - "filename": "4077_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 23 - }, - "frame": { - "x": 58, - "y": 140, - "w": 26, - "h": 23 - } - }, - { - "filename": "863_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 84, - "y": 139, - "w": 22, - "h": 26 + "x": 157, + "y": 0, + "w": 24, + "h": 17 } }, { @@ -1215,41 +207,104 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 8, + "y": 6, + "w": 24, + "h": 17 + }, + "frame": { + "x": 181, + "y": 0, + "w": 24, + "h": 17 + } + }, + { + "filename": "829_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 18 + }, + "frame": { + "x": 205, + "y": 0, + "w": 17, + "h": 18 + } + }, + { + "filename": "829_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 18 + }, + "frame": { + "x": 222, + "y": 0, + "w": 17, + "h": 18 + } + }, + { + "filename": "877-hangry_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 239, + "y": 0, + "w": 17, + "h": 21 + } + }, + { + "filename": "822_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 5, - "w": 26, + "w": 22, "h": 19 }, "frame": { - "x": 106, - "y": 150, - "w": 26, + "x": 0, + "y": 14, + "w": 22, "h": 19 } }, { - "filename": "4077_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 23 - }, - "frame": { - "x": 29, - "y": 160, - "w": 26, - "h": 23 - } - }, - { - "filename": "856_2", + "filename": "822_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1258,19 +313,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, - "w": 21, - "h": 25 + "y": 5, + "w": 22, + "h": 19 }, "frame": { - "x": 28, - "y": 183, - "w": 21, - "h": 25 + "x": 22, + "y": 14, + "w": 22, + "h": 19 } }, { - "filename": "856_3", + "filename": "835_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1279,15 +334,36 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, - "w": 21, - "h": 25 + "y": 5, + "w": 22, + "h": 20 }, "frame": { - "x": 28, - "y": 208, - "w": 21, - "h": 25 + "x": 44, + "y": 16, + "w": 22, + "h": 20 + } + }, + { + "filename": "835_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 20 + }, + "frame": { + "x": 66, + "y": 16, + "w": 22, + "h": 20 } }, { @@ -1299,16 +375,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 22 + "x": 9, + "y": 5, + "w": 22, + "h": 20 }, "frame": { - "x": 55, - "y": 163, - "w": 24, - "h": 22 + "x": 88, + "y": 16, + "w": 22, + "h": 20 } }, { @@ -1320,15 +396,372 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 9, + "y": 5, + "w": 22, + "h": 20 + }, + "frame": { + "x": 110, + "y": 16, + "w": 22, + "h": 20 + } + }, + { + "filename": "877-hangry_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, "y": 4, - "w": 24, + "w": 17, + "h": 21 + }, + "frame": { + "x": 132, + "y": 17, + "w": 17, + "h": 21 + } + }, + { + "filename": "877-hangry_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 149, + "y": 17, + "w": 17, + "h": 21 + } + }, + { + "filename": "877_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 166, + "y": 17, + "w": 17, + "h": 21 + } + }, + { + "filename": "877_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 183, + "y": 17, + "w": 17, + "h": 21 + } + }, + { + "filename": "877_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 200, + "y": 18, + "w": 17, + "h": 21 + } + }, + { + "filename": "4052_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 217, + "y": 18, + "w": 21, + "h": 21 + } + }, + { + "filename": "6215_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 238, + "y": 21, + "w": 17, + "h": 21 + } + }, + { + "filename": "4052_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 0, + "y": 33, + "w": 21, + "h": 21 + } + }, + { + "filename": "6215_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 21, + "y": 33, + "w": 17, + "h": 21 + } + }, + { + "filename": "836_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, "h": 22 }, "frame": { - "x": 49, - "y": 185, - "w": 24, + "x": 38, + "y": 36, + "w": 22, + "h": 22 + } + }, + { + "filename": "836_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 60, + "y": 36, + "w": 22, + "h": 22 + } + }, + { + "filename": "857_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 82, + "y": 36, + "w": 22, + "h": 22 + } + }, + { + "filename": "857_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 104, + "y": 36, + "w": 22, + "h": 22 + } + }, + { + "filename": "873_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 126, + "y": 38, + "w": 25, + "h": 22 + } + }, + { + "filename": "873_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 151, + "y": 38, + "w": 25, + "h": 22 + } + }, + { + "filename": "6570_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 176, + "y": 38, + "w": 18, + "h": 22 + } + }, + { + "filename": "873_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 194, + "y": 39, + "w": 25, "h": 22 } }, @@ -1341,20 +774,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 20, - "h": 24 + "x": 12, + "y": 6, + "w": 18, + "h": 22 }, "frame": { - "x": 49, - "y": 207, - "w": 20, - "h": 24 + "x": 219, + "y": 39, + "w": 18, + "h": 22 } }, { - "filename": "4263_2", + "filename": "6705_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1362,20 +795,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 13, "y": 6, - "w": 24, - "h": 18 + "w": 15, + "h": 22 }, "frame": { - "x": 79, - "y": 165, - "w": 24, - "h": 18 + "x": 237, + "y": 42, + "w": 15, + "h": 22 } }, { - "filename": "4263_3", + "filename": "6705_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1383,41 +816,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 13, "y": 6, - "w": 24, - "h": 18 + "w": 15, + "h": 22 }, "frame": { - "x": 103, - "y": 169, - "w": 24, - "h": 18 + "x": 0, + "y": 54, + "w": 15, + "h": 22 } }, { - "filename": "821_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 21, - "h": 18 - }, - "frame": { - "x": 132, - "y": 161, - "w": 21, - "h": 18 - } - }, - { - "filename": "877-hangry_3", + "filename": "830_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1431,12 +843,138 @@ "h": 23 }, "frame": { - "x": 73, - "y": 185, + "x": 15, + "y": 54, "w": 19, "h": 23 } }, + { + "filename": "830_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 34, + "y": 58, + "w": 19, + "h": 23 + } + }, + { + "filename": "856_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 53, + "y": 58, + "w": 19, + "h": 23 + } + }, + { + "filename": "856_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 72, + "y": 58, + "w": 19, + "h": 23 + } + }, + { + "filename": "901_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 91, + "y": 58, + "w": 28, + "h": 23 + } + }, + { + "filename": "901_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 119, + "y": 60, + "w": 28, + "h": 23 + } + }, + { + "filename": "901_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 147, + "y": 60, + "w": 28, + "h": 23 + } + }, { "filename": "6549_2", "rotated": false, @@ -1446,16 +984,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 25 + "x": 12, + "y": 5, + "w": 16, + "h": 23 }, "frame": { - "x": 69, - "y": 208, - "w": 18, - "h": 25 + "x": 175, + "y": 60, + "w": 16, + "h": 23 } }, { @@ -1467,20 +1005,209 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 25 + "x": 12, + "y": 5, + "w": 16, + "h": 23 }, "frame": { - "x": 87, - "y": 208, - "w": 18, - "h": 25 + "x": 191, + "y": 61, + "w": 16, + "h": 23 } }, { - "filename": "821_3", + "filename": "6571_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 207, + "y": 61, + "w": 25, + "h": 23 + } + }, + { + "filename": "863_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 20, + "h": 24 + }, + "frame": { + "x": 232, + "y": 64, + "w": 20, + "h": 24 + } + }, + { + "filename": "6571_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 0, + "y": 77, + "w": 25, + "h": 23 + } + }, + { + "filename": "823_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 25, + "y": 81, + "w": 27, + "h": 24 + } + }, + { + "filename": "823_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 52, + "y": 81, + "w": 27, + "h": 24 + } + }, + { + "filename": "863_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 20, + "h": 24 + }, + "frame": { + "x": 79, + "y": 81, + "w": 20, + "h": 24 + } + }, + { + "filename": "886_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 99, + "y": 83, + "w": 26, + "h": 24 + } + }, + { + "filename": "886_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 125, + "y": 83, + "w": 26, + "h": 24 + } + }, + { + "filename": "886_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 151, + "y": 83, + "w": 26, + "h": 24 + } + }, + { + "filename": "858_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1489,229 +1216,124 @@ }, "spriteSourceSize": { "x": 9, - "y": 6, - "w": 21, - "h": 18 - }, - "frame": { - "x": 92, - "y": 187, - "w": 21, - "h": 18 - } - }, - { - "filename": "829_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 19, - "h": 20 - }, - "frame": { - "x": 113, - "y": 187, - "w": 19, - "h": 20 - } - }, - { - "filename": "877_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 132, - "y": 179, - "w": 19, - "h": 23 - } - }, - { - "filename": "877_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 105, - "y": 207, - "w": 19, - "h": 23 - } - }, - { - "filename": "877_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 124, - "y": 207, - "w": 19, - "h": 23 - } - }, - { - "filename": "6705_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 17, - "h": 24 - }, - "frame": { - "x": 143, - "y": 202, - "w": 17, - "h": 24 - } - }, - { - "filename": "6215_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 151, - "y": 179, - "w": 19, - "h": 23 - } - }, - { - "filename": "6705_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 17, - "h": 24 - }, - "frame": { - "x": 160, - "y": 202, - "w": 17, - "h": 24 - } - }, - { - "filename": "6215_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 23 - }, - "frame": { - "x": 170, - "y": 175, - "w": 19, - "h": 23 - } - }, - { - "filename": "829_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 19, - "h": 20 - }, - "frame": { - "x": 189, - "y": 175, - "w": 19, - "h": 20 - } - }, - { - "filename": "872_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 + "y": 2, + "w": 22, + "h": 25 }, "frame": { "x": 177, - "y": 198, - "w": 19, - "h": 16 + "y": 84, + "w": 22, + "h": 25 } }, { - "filename": "872_2", + "filename": "858_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 25 + }, + "frame": { + "x": 199, + "y": 84, + "w": 22, + "h": 25 + } + }, + { + "filename": "900_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 221, + "y": 88, + "w": 25, + "h": 25 + } + }, + { + "filename": "900_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 0, + "y": 100, + "w": 25, + "h": 25 + } + }, + { + "filename": "6706_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 25, + "y": 105, + "w": 26, + "h": 25 + } + }, + { + "filename": "6706_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 51, + "y": 105, + "w": 26, + "h": 25 + } + }, + { + "filename": "903_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1720,19 +1342,166 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 19, - "h": 16 + "y": 1, + "w": 21, + "h": 27 }, "frame": { - "x": 177, - "y": 214, - "w": 19, - "h": 16 + "x": 77, + "y": 105, + "w": 21, + "h": 27 } }, { - "filename": "872_3", + "filename": "887_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 98, + "y": 107, + "w": 30, + "h": 26 + } + }, + { + "filename": "887_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 128, + "y": 107, + "w": 30, + "h": 26 + } + }, + { + "filename": "887_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 158, + "y": 109, + "w": 30, + "h": 26 + } + }, + { + "filename": "823-gigantamax_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 32, + "h": 27 + }, + "frame": { + "x": 188, + "y": 109, + "w": 32, + "h": 27 + } + }, + { + "filename": "823-gigantamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 1, + "w": 32, + "h": 27 + }, + "frame": { + "x": 220, + "y": 113, + "w": 32, + "h": 27 + } + }, + { + "filename": "862_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 0, + "y": 125, + "w": 25, + "h": 27 + } + }, + { + "filename": "862_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 25, + "y": 130, + "w": 25, + "h": 27 + } + }, + { + "filename": "903_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1741,15 +1510,183 @@ }, "spriteSourceSize": { "x": 10, - "y": 7, - "w": 19, - "h": 16 + "y": 1, + "w": 21, + "h": 27 }, "frame": { - "x": 196, - "y": 195, - "w": 19, - "h": 16 + "x": 50, + "y": 130, + "w": 21, + "h": 27 + } + }, + { + "filename": "851-gigantamax_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 32, + "h": 28 + }, + "frame": { + "x": 71, + "y": 133, + "w": 32, + "h": 28 + } + }, + { + "filename": "851-gigantamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 32, + "h": 28 + }, + "frame": { + "x": 103, + "y": 133, + "w": 32, + "h": 28 + } + }, + { + "filename": "890_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 33, + "h": 28 + }, + "frame": { + "x": 135, + "y": 135, + "w": 33, + "h": 28 + } + }, + { + "filename": "890_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 1, + "w": 33, + "h": 28 + }, + "frame": { + "x": 168, + "y": 136, + "w": 33, + "h": 28 + } + }, + { + "filename": "858-gigantamax_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 201, + "y": 140, + "w": 29, + "h": 30 + } + }, + { + "filename": "858-gigantamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 29, + "h": 30 + }, + "frame": { + "x": 0, + "y": 157, + "w": 29, + "h": 30 + } + }, + { + "filename": "890-eternamax_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 38, + "h": 30 + }, + "frame": { + "x": 29, + "y": 157, + "w": 38, + "h": 30 + } + }, + { + "filename": "890-eternamax_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 38, + "h": 30 + }, + "frame": { + "x": 67, + "y": 161, + "w": 38, + "h": 30 } } ] @@ -1758,6 +1695,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:14585a83d0b28b6af5cf64bd92dafbe3:270ebc64c213a6d90c7648981f22bde8:ec5f05e7f30cd98f74db0c2326109fd3$" + "smartupdate": "$TexturePacker:SmartUpdate:46ea0e3184e18c1aaf597190ec67ac21:3a540b371e81ee4d6c9bc17c17af8f9f:ec5f05e7f30cd98f74db0c2326109fd3$" } } diff --git a/public/images/pokemon_icons_8v.png b/public/images/pokemon_icons_8v.png index f537bf3c19e..51f3e45895f 100644 Binary files a/public/images/pokemon_icons_8v.png and b/public/images/pokemon_icons_8v.png differ diff --git a/public/images/pokemon_icons_9v.json b/public/images/pokemon_icons_9v.json index e9f63b94629..ab8f35cbc2d 100644 --- a/public/images/pokemon_icons_9v.json +++ b/public/images/pokemon_icons_9v.json @@ -4,13 +4,13 @@ "image": "pokemon_icons_9v.png", "format": "RGBA8888", "size": { - "w": 239, - "h": 239 + "w": 255, + "h": 192 }, "scale": 1, "frames": [ { - "filename": "1007-apex-build_2", + "filename": "969_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -18,20 +18,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 30 + "x": 11, + "y": 16, + "w": 18, + "h": 12 }, "frame": { "x": 0, "y": 0, - "w": 34, - "h": 30 + "w": 18, + "h": 12 } }, { - "filename": "1007-apex-build_3", + "filename": "969_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -39,20 +39,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 34, - "h": 30 + "x": 11, + "y": 16, + "w": 18, + "h": 12 }, "frame": { - "x": 0, - "y": 30, - "w": 34, - "h": 30 + "x": 18, + "y": 0, + "w": 18, + "h": 12 } }, { - "filename": "1001_2", + "filename": "978-curly_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -60,20 +60,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 34, + "x": 36, "y": 0, - "w": 32, - "h": 30 + "w": 15, + "h": 14 } }, { - "filename": "1001_3", + "filename": "978-curly_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -81,20 +81,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 0, - "y": 60, - "w": 32, - "h": 30 + "x": 51, + "y": 0, + "w": 15, + "h": 14 } }, { - "filename": "1008-ultimate-mode_1", + "filename": "978-droopy_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -102,41 +102,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 - }, - "frame": { - "x": 34, - "y": 30, - "w": 32, - "h": 30 - } - }, - { - "filename": "1008-ultimate-mode_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 14, + "w": 15, + "h": 14 }, "frame": { "x": 66, "y": 0, - "w": 32, - "h": 30 + "w": 15, + "h": 14 } }, { - "filename": "1008-ultimate-mode_3", + "filename": "978-droopy_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -144,20 +123,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 0, - "y": 90, - "w": 32, - "h": 30 + "x": 81, + "y": 0, + "w": 15, + "h": 14 } }, { - "filename": "8901_1", + "filename": "978-stretchy_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -165,20 +144,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 32, - "y": 60, - "w": 32, - "h": 30 + "x": 96, + "y": 0, + "w": 15, + "h": 14 } }, { - "filename": "8901_2", + "filename": "978-stretchy_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -186,20 +165,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 14, + "w": 15, + "h": 14 }, "frame": { - "x": 66, - "y": 30, - "w": 32, - "h": 30 + "x": 111, + "y": 0, + "w": 15, + "h": 14 } }, { - "filename": "8901_3", + "filename": "919_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -207,20 +186,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 + "x": 12, + "y": 13, + "w": 16, + "h": 15 }, "frame": { - "x": 98, + "x": 126, "y": 0, - "w": 32, - "h": 30 + "w": 16, + "h": 15 } }, { - "filename": "937_1", + "filename": "919_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -228,20 +207,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 31, - "h": 29 + "x": 12, + "y": 13, + "w": 16, + "h": 15 }, "frame": { - "x": 0, - "y": 120, - "w": 31, - "h": 29 + "x": 142, + "y": 0, + "w": 16, + "h": 15 } }, { - "filename": "937_2", + "filename": "919_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -249,20 +228,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 31, - "h": 29 + "x": 12, + "y": 13, + "w": 16, + "h": 15 }, "frame": { - "x": 32, - "y": 90, - "w": 31, - "h": 29 + "x": 158, + "y": 0, + "w": 16, + "h": 15 } }, { - "filename": "937_3", + "filename": "970_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -270,20 +249,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 31, - "h": 29 + "x": 10, + "y": 12, + "w": 20, + "h": 16 }, "frame": { - "x": 64, - "y": 60, - "w": 31, - "h": 29 + "x": 174, + "y": 0, + "w": 20, + "h": 16 } }, { - "filename": "937_9", + "filename": "970_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -291,20 +270,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 31, - "h": 29 + "x": 10, + "y": 12, + "w": 20, + "h": 16 }, "frame": { - "x": 98, - "y": 30, - "w": 31, - "h": 29 + "x": 194, + "y": 0, + "w": 20, + "h": 16 } }, { - "filename": "934_2", + "filename": "909_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -312,209 +291,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 130, - "y": 0, - "w": 29, - "h": 30 - } - }, - { - "filename": "934_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 0, - "y": 149, - "w": 29, - "h": 30 - } - }, - { - "filename": "994_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 159, - "y": 0, - "w": 29, - "h": 30 - } - }, - { - "filename": "994_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 29, - "h": 30 - }, - "frame": { - "x": 0, - "y": 179, - "w": 29, - "h": 30 - } - }, - { - "filename": "988_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 209, - "w": 28, - "h": 30 - } - }, - { - "filename": "988_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 28, - "y": 209, - "w": 28, - "h": 30 - } - }, - { - "filename": "911_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 30, - "h": 25 - }, - "frame": { - "x": 129, - "y": 30, - "w": 30, - "h": 25 - } - }, - { - "filename": "911_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 30, - "h": 25 - }, - "frame": { - "x": 188, - "y": 0, - "w": 30, - "h": 25 - } - }, - { - "filename": "962_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 27 - }, - "frame": { - "x": 218, - "y": 0, - "w": 21, - "h": 27 - } - }, - { - "filename": "925-four_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, + "x": 11, "y": 5, - "w": 31, - "h": 24 + "w": 18, + "h": 19 }, "frame": { - "x": 159, - "y": 30, - "w": 31, - "h": 24 + "x": 214, + "y": 0, + "w": 18, + "h": 19 } }, { - "filename": "968_2", + "filename": "967_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -522,20 +312,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 29 + "x": 10, + "y": 9, + "w": 20, + "h": 19 }, "frame": { - "x": 190, - "y": 25, - "w": 25, - "h": 29 + "x": 232, + "y": 0, + "w": 20, + "h": 19 } }, { - "filename": "999_1", + "filename": "967_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -543,16 +333,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 30 + "x": 10, + "y": 9, + "w": 20, + "h": 19 }, "frame": { - "x": 215, - "y": 27, - "w": 24, + "x": 0, + "y": 12, + "w": 20, + "h": 19 + } + }, + { + "filename": "935_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 13, + "h": 21 + }, + "frame": { + "x": 20, + "y": 12, + "w": 13, + "h": 21 + } + }, + { + "filename": "967_3_GENERATED", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 9, + "w": 20, + "h": 19 + }, + "frame": { + "x": 33, + "y": 14, + "w": 20, + "h": 19 } }, { @@ -564,79 +396,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 + "x": 5, + "y": 8, + "w": 29, + "h": 20 }, "frame": { - "x": 129, - "y": 55, - "w": 31, - "h": 22 - } - }, - { - "filename": "925-four_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 31, - "h": 24 - }, - "frame": { - "x": 160, - "y": 54, - "w": 31, - "h": 24 - } - }, - { - "filename": "920_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 191, - "y": 54, - "w": 24, - "h": 25 - } - }, - { - "filename": "999_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 30 - }, - "frame": { - "x": 215, - "y": 57, - "w": 24, - "h": 30 + "x": 53, + "y": 14, + "w": 29, + "h": 20 } }, { @@ -648,16 +417,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 + "x": 5, + "y": 8, + "w": 29, + "h": 20 }, "frame": { - "x": 98, - "y": 59, - "w": 31, - "h": 22 + "x": 82, + "y": 14, + "w": 29, + "h": 20 } }, { @@ -669,15 +438,309 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 111, + "y": 15, + "w": 29, + "h": 20 + } + }, + { + "filename": "925-three_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 140, + "y": 15, + "w": 29, + "h": 20 + } + }, + { + "filename": "925-three_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 169, + "y": 16, + "w": 29, + "h": 20 + } + }, + { + "filename": "935_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, "y": 7, - "w": 31, + "w": 13, + "h": 21 + }, + "frame": { + "x": 198, + "y": 16, + "w": 13, + "h": 21 + } + }, + { + "filename": "925-three_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 211, + "y": 19, + "w": 29, + "h": 20 + } + }, + { + "filename": "935_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 13, + "h": 21 + }, + "frame": { + "x": 240, + "y": 19, + "w": 13, + "h": 21 + } + }, + { + "filename": "948_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 0, + "y": 31, + "w": 16, + "h": 21 + } + }, + { + "filename": "1004_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 16, + "y": 33, + "w": 21, + "h": 20 + } + }, + { + "filename": "948_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 37, + "y": 33, + "w": 16, + "h": 21 + } + }, + { + "filename": "1004_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 53, + "y": 34, + "w": 21, + "h": 20 + } + }, + { + "filename": "910_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 74, + "y": 34, + "w": 21, + "h": 21 + } + }, + { + "filename": "910_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 95, + "y": 35, + "w": 21, + "h": 21 + } + }, + { + "filename": "925-four_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 29, "h": 22 }, "frame": { - "x": 129, - "y": 77, - "w": 31, + "x": 116, + "y": 35, + "w": 29, + "h": 22 + } + }, + { + "filename": "909_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 145, + "y": 35, + "w": 21, + "h": 23 + } + }, + { + "filename": "925-four_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 29, + "h": 22 + }, + "frame": { + "x": 166, + "y": 36, + "w": 29, "h": 22 } }, @@ -690,16 +753,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 31, - "h": 24 + "x": 5, + "y": 6, + "w": 29, + "h": 22 }, "frame": { - "x": 160, - "y": 78, - "w": 31, - "h": 24 + "x": 195, + "y": 39, + "w": 29, + "h": 22 + } + }, + { + "filename": "911_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 224, + "y": 40, + "w": 28, + "h": 23 + } + }, + { + "filename": "911_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 0, + "y": 53, + "w": 28, + "h": 23 + } + }, + { + "filename": "920_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 28, + "y": 54, + "w": 22, + "h": 23 } }, { @@ -710,268 +836,16 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 191, - "y": 79, - "w": 24, - "h": 25 - } - }, - { - "filename": "999_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 30 - }, - "frame": { - "x": 215, - "y": 87, - "w": 24, - "h": 30 - } - }, - { - "filename": "925-three_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 95, - "y": 81, - "w": 31, - "h": 22 - } - }, - { - "filename": "925-three_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 64, - "y": 89, - "w": 31, - "h": 22 - } - }, - { - "filename": "925-three_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 31, - "h": 22 - }, - "frame": { - "x": 95, - "y": 103, - "w": 31, - "h": 22 - } - }, - { - "filename": "987_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 9, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 126, - "y": 99, - "w": 26, - "h": 26 - } - }, - { - "filename": "933_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, + "y": 5, + "w": 22, "h": 23 }, "frame": { - "x": 152, - "y": 102, - "w": 27, - "h": 23 - } - }, - { - "filename": "933_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 23 - }, - "frame": { - "x": 179, - "y": 104, - "w": 27, - "h": 23 - } - }, - { - "filename": "987_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 63, - "y": 111, - "w": 26, - "h": 26 - } - }, - { - "filename": "987_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 26, - "h": 26 - }, - "frame": { - "x": 89, - "y": 125, - "w": 26, - "h": 26 - } - }, - { - "filename": "968_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 29 - }, - "frame": { - "x": 115, - "y": 125, - "w": 25, - "h": 29 - } - }, - { - "filename": "1000_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 140, - "y": 125, - "w": 24, - "h": 29 - } - }, - { - "filename": "935_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 15, - "h": 23 - }, - "frame": { - "x": 164, - "y": 125, - "w": 15, + "x": 50, + "y": 54, + "w": 22, "h": 23 } }, @@ -983,122 +857,17 @@ "w": 40, "h": 30 }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 25 - }, - "frame": { - "x": 179, - "y": 127, - "w": 24, - "h": 25 - } - }, - { - "filename": "936_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, "spriteSourceSize": { "x": 9, - "y": 0, + "y": 5, "w": 22, - "h": 29 + "h": 23 }, "frame": { - "x": 29, - "y": 149, + "x": 72, + "y": 55, "w": 22, - "h": 29 - } - }, - { - "filename": "936_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 22, - "h": 29 - }, - "frame": { - "x": 29, - "y": 178, - "w": 22, - "h": 29 - } - }, - { - "filename": "936_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 22, - "h": 29 - }, - "frame": { - "x": 31, - "y": 120, - "w": 22, - "h": 29 - } - }, - { - "filename": "1000_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 51, - "y": 149, - "w": 24, - "h": 29 - } - }, - { - "filename": "1000_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 51, - "y": 178, - "w": 24, - "h": 29 + "h": 23 } }, { @@ -1110,16 +879,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 27 + "x": 10, + "y": 3, + "w": 20, + "h": 25 }, "frame": { - "x": 56, - "y": 207, - "w": 22, - "h": 27 + "x": 94, + "y": 56, + "w": 20, + "h": 25 + } + }, + { + "filename": "987_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 114, + "y": 57, + "w": 24, + "h": 24 + } + }, + { + "filename": "987_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 138, + "y": 58, + "w": 24, + "h": 24 + } + }, + { + "filename": "987_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 162, + "y": 58, + "w": 24, + "h": 24 } }, { @@ -1131,16 +963,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 27 + "x": 10, + "y": 3, + "w": 20, + "h": 25 }, "frame": { - "x": 75, - "y": 151, - "w": 22, - "h": 27 + "x": 186, + "y": 61, + "w": 20, + "h": 25 + } + }, + { + "filename": "973_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 206, + "y": 61, + "w": 15, + "h": 26 + } + }, + { + "filename": "962_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 25 + }, + "frame": { + "x": 221, + "y": 63, + "w": 19, + "h": 25 + } + }, + { + "filename": "973_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 240, + "y": 63, + "w": 15, + "h": 26 } }, { @@ -1152,78 +1047,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 27 - }, - "frame": { - "x": 75, - "y": 178, - "w": 21, - "h": 27 - } - }, - { - "filename": "948_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 - }, - "frame": { - "x": 97, - "y": 151, - "w": 18, - "h": 23 - } - }, - { - "filename": "909_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 23, + "x": 10, + "y": 3, + "w": 19, "h": 25 }, "frame": { - "x": 115, - "y": 154, - "w": 23, - "h": 25 - } - }, - { - "filename": "909_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 138, - "y": 154, - "w": 23, + "x": 0, + "y": 76, + "w": 19, "h": 25 } }, @@ -1236,58 +1068,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 27 + "x": 10, + "y": 3, + "w": 19, + "h": 25 }, "frame": { - "x": 78, - "y": 205, - "w": 21, - "h": 27 - } - }, - { - "filename": "973_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 203, - "y": 127, - "w": 17, - "h": 28 - } - }, - { - "filename": "973_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 220, - "y": 117, - "w": 17, - "h": 28 + "x": 19, + "y": 77, + "w": 19, + "h": 25 } }, { @@ -1299,20 +1089,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 38, + "y": 77, + "w": 15, + "h": 26 + } + }, + { + "filename": "1000_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 1, - "w": 17, - "h": 28 + "w": 22, + "h": 27 }, "frame": { - "x": 161, - "y": 154, - "w": 17, - "h": 28 + "x": 53, + "y": 78, + "w": 22, + "h": 27 } }, { - "filename": "910_2", + "filename": "1000_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1321,19 +1132,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 3, - "w": 23, - "h": 23 + "y": 1, + "w": 22, + "h": 27 }, "frame": { - "x": 178, - "y": 152, - "w": 23, - "h": 23 + "x": 75, + "y": 81, + "w": 22, + "h": 27 } }, { - "filename": "910_3", + "filename": "1000_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1342,124 +1153,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 3, - "w": 23, - "h": 23 - }, - "frame": { - "x": 201, - "y": 155, - "w": 23, - "h": 23 - } - }, - { - "filename": "935_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 15, - "h": 23 - }, - "frame": { - "x": 224, - "y": 145, - "w": 15, - "h": 23 - } - }, - { - "filename": "935_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 15, - "h": 23 - }, - "frame": { - "x": 224, - "y": 168, - "w": 15, - "h": 23 - } - }, - { - "filename": "1004_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 178, - "y": 175, - "w": 23, - "h": 22 - } - }, - { - "filename": "1004_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 22 - }, - "frame": { - "x": 201, - "y": 178, - "w": 23, - "h": 22 - } - }, - { - "filename": "919_1", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 17 + "y": 1, + "w": 22, + "h": 27 }, "frame": { "x": 97, - "y": 174, - "w": 18, - "h": 17 + "y": 81, + "w": 22, + "h": 27 } }, { - "filename": "969_2", + "filename": "936_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1468,103 +1174,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 15, + "y": 0, "w": 20, - "h": 14 + "h": 28 }, "frame": { - "x": 96, - "y": 191, + "x": 119, + "y": 82, "w": 20, - "h": 14 + "h": 28 } }, { - "filename": "948_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 18, - "h": 23 - }, - "frame": { - "x": 99, - "y": 205, - "w": 18, - "h": 23 - } - }, - { - "filename": "967_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 116, - "y": 179, - "w": 22, - "h": 21 - } - }, - { - "filename": "967_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 21 - }, - "frame": { - "x": 138, - "y": 179, - "w": 22, - "h": 21 - } - }, - { - "filename": "919_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 17 - }, - "frame": { - "x": 160, - "y": 182, - "w": 18, - "h": 17 - } - }, - { - "filename": "932_2", + "filename": "936_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1573,82 +1195,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 8, + "y": 0, "w": 20, - "h": 21 - }, - "frame": { - "x": 117, - "y": 200, - "w": 20, - "h": 21 - } - }, - { - "filename": "970_2", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 18 - }, - "frame": { - "x": 117, - "y": 221, - "w": 22, - "h": 18 - } - }, - { - "filename": "932_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 21 - }, - "frame": { - "x": 137, - "y": 200, - "w": 20, - "h": 21 - } - }, - { - "filename": "970_3", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 11, - "w": 22, - "h": 18 + "h": 28 }, "frame": { "x": 139, - "y": 221, - "w": 22, - "h": 18 + "y": 82, + "w": 20, + "h": 28 } }, { - "filename": "969_3", + "filename": "936_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1657,19 +1216,19 @@ }, "spriteSourceSize": { "x": 10, - "y": 15, + "y": 0, "w": 20, - "h": 14 + "h": 28 }, "frame": { - "x": 178, - "y": 197, + "x": 159, + "y": 82, "w": 20, - "h": 14 + "h": 28 } }, { - "filename": "919_3", + "filename": "968_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1677,20 +1236,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 18, - "h": 17 + "x": 8, + "y": 0, + "w": 23, + "h": 28 }, "frame": { - "x": 160, - "y": 199, - "w": 18, - "h": 17 + "x": 179, + "y": 86, + "w": 23, + "h": 28 } }, { - "filename": "978-curly_2", + "filename": "937_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1698,20 +1257,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 16 + "x": 5, + "y": 0, + "w": 29, + "h": 28 }, "frame": { - "x": 161, - "y": 216, - "w": 17, - "h": 16 + "x": 202, + "y": 88, + "w": 29, + "h": 28 } }, { - "filename": "978-curly_3", + "filename": "968_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1719,20 +1278,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 16 + "x": 8, + "y": 0, + "w": 23, + "h": 28 }, "frame": { - "x": 178, - "y": 211, - "w": 17, - "h": 16 + "x": 231, + "y": 89, + "w": 23, + "h": 28 } }, { - "filename": "978-droopy_2", + "filename": "937_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1740,20 +1299,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 16 + "x": 5, + "y": 0, + "w": 29, + "h": 28 }, "frame": { - "x": 198, - "y": 200, - "w": 17, - "h": 16 + "x": 0, + "y": 102, + "w": 29, + "h": 28 } }, { - "filename": "978-droopy_3", + "filename": "999_1", "rotated": false, "trimmed": true, "sourceSize": { @@ -1761,20 +1320,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 16 + "x": 9, + "y": 0, + "w": 22, + "h": 29 }, "frame": { - "x": 215, - "y": 200, - "w": 17, - "h": 16 + "x": 29, + "y": 103, + "w": 22, + "h": 29 } }, { - "filename": "978-stretchy_2", + "filename": "999_2", "rotated": false, "trimmed": true, "sourceSize": { @@ -1782,20 +1341,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 16 + "x": 9, + "y": 0, + "w": 22, + "h": 29 }, "frame": { - "x": 195, - "y": 216, - "w": 17, - "h": 16 + "x": 51, + "y": 105, + "w": 22, + "h": 29 } }, { - "filename": "978-stretchy_3", + "filename": "937_3", "rotated": false, "trimmed": true, "sourceSize": { @@ -1803,16 +1362,331 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 13, - "w": 17, - "h": 16 + "x": 5, + "y": 0, + "w": 29, + "h": 28 }, "frame": { - "x": 212, - "y": 216, - "w": 17, - "h": 16 + "x": 73, + "y": 108, + "w": 29, + "h": 28 + } + }, + { + "filename": "937_9", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 29, + "h": 28 + }, + "frame": { + "x": 102, + "y": 110, + "w": 29, + "h": 28 + } + }, + { + "filename": "988_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 26, + "h": 28 + }, + "frame": { + "x": 131, + "y": 110, + "w": 26, + "h": 28 + } + }, + { + "filename": "999_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 22, + "h": 29 + }, + "frame": { + "x": 157, + "y": 110, + "w": 22, + "h": 29 + } + }, + { + "filename": "988_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 26, + "h": 28 + }, + "frame": { + "x": 179, + "y": 116, + "w": 26, + "h": 28 + } + }, + { + "filename": "994_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 27, + "h": 28 + }, + "frame": { + "x": 205, + "y": 117, + "w": 27, + "h": 28 + } + }, + { + "filename": "8901_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 28 + }, + "frame": { + "x": 0, + "y": 132, + "w": 30, + "h": 28 + } + }, + { + "filename": "8901_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 28 + }, + "frame": { + "x": 30, + "y": 134, + "w": 30, + "h": 28 + } + }, + { + "filename": "8901_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 28 + }, + "frame": { + "x": 60, + "y": 136, + "w": 30, + "h": 28 + } + }, + { + "filename": "1007-apex-build_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 32, + "h": 29 + }, + "frame": { + "x": 90, + "y": 138, + "w": 32, + "h": 29 + } + }, + { + "filename": "1007-apex-build_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 0, + "w": 32, + "h": 29 + }, + "frame": { + "x": 122, + "y": 138, + "w": 32, + "h": 29 + } + }, + { + "filename": "1001_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 154, + "y": 144, + "w": 30, + "h": 30 + } + }, + { + "filename": "1001_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 184, + "y": 145, + "w": 30, + "h": 30 + } + }, + { + "filename": "1008-ultimate-mode_1", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 214, + "y": 145, + "w": 30, + "h": 30 + } + }, + { + "filename": "1008-ultimate-mode_2", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 0, + "y": 160, + "w": 30, + "h": 30 + } + }, + { + "filename": "1008-ultimate-mode_3", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 0, + "w": 30, + "h": 30 + }, + "frame": { + "x": 30, + "y": 162, + "w": 30, + "h": 30 } } ] @@ -1821,6 +1695,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8404ea730f042d97434b0d18be5ccb5d:37b33f78cd55ef253f48802c7f011cd6:3ec5c0bc286c296cfb7fa30a8b06f3da$" + "smartupdate": "$TexturePacker:SmartUpdate:e13913ee53c8c8b8d34f09462f41779c:a3af5af16818051dcd6e98778f97c144:3ec5c0bc286c296cfb7fa30a8b06f3da$" } } diff --git a/public/images/pokemon_icons_9v.png b/public/images/pokemon_icons_9v.png index 2d36f6b090e..c7522b17a28 100644 Binary files a/public/images/pokemon_icons_9v.png and b/public/images/pokemon_icons_9v.png differ diff --git a/public/images/ui/legacy/summary_moves_effect.png b/public/images/ui/legacy/summary_moves_effect.png index ed422d1b439..8d6ef024cf3 100644 Binary files a/public/images/ui/legacy/summary_moves_effect.png and b/public/images/ui/legacy/summary_moves_effect.png differ diff --git a/public/images/ui/legacy/summary_moves_effect_de.png b/public/images/ui/legacy/summary_moves_effect_de.png new file mode 100644 index 00000000000..8d6ef024cf3 Binary files /dev/null and b/public/images/ui/legacy/summary_moves_effect_de.png differ diff --git a/public/images/ui/legacy/summary_moves_effect_es.png b/public/images/ui/legacy/summary_moves_effect_es.png new file mode 100644 index 00000000000..a48f90cc8f6 Binary files /dev/null and b/public/images/ui/legacy/summary_moves_effect_es.png differ diff --git a/public/images/ui/legacy/summary_moves_effect_fr.png b/public/images/ui/legacy/summary_moves_effect_fr.png new file mode 100644 index 00000000000..9d65c920176 Binary files /dev/null and b/public/images/ui/legacy/summary_moves_effect_fr.png differ diff --git a/public/images/ui/legacy/summary_moves_effect_it.png b/public/images/ui/legacy/summary_moves_effect_it.png new file mode 100644 index 00000000000..8d6ef024cf3 Binary files /dev/null and b/public/images/ui/legacy/summary_moves_effect_it.png differ diff --git a/public/images/ui/legacy/summary_moves_effect_pt_BR.png b/public/images/ui/legacy/summary_moves_effect_pt_BR.png new file mode 100644 index 00000000000..f5a0c2ea736 Binary files /dev/null and b/public/images/ui/legacy/summary_moves_effect_pt_BR.png differ diff --git a/public/images/ui/legacy/summary_moves_effect_zh_CN.png b/public/images/ui/legacy/summary_moves_effect_zh_CN.png new file mode 100644 index 00000000000..8d6ef024cf3 Binary files /dev/null and b/public/images/ui/legacy/summary_moves_effect_zh_CN.png differ diff --git a/public/images/ui/legacy/summary_stats.png b/public/images/ui/legacy/summary_stats.png index e744f84be8f..53c6a18caab 100644 Binary files a/public/images/ui/legacy/summary_stats.png and b/public/images/ui/legacy/summary_stats.png differ diff --git a/src/battle-scene.ts b/src/battle-scene.ts index f15cf1a52e2..0f75447a500 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1013,6 +1013,7 @@ export default class BattleScene extends SceneBase { case Species.FURFROU: case Species.ORICORIO: case Species.MAGEARNA: + case Species.ZARUDE: case Species.SQUAWKABILLY: case Species.TATSUGIRI: case Species.PALDEA_TAUROS: diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index f66b5b2a0d9..849128517d2 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -14,7 +14,7 @@ import { BattlerTagType } from "./enums/battler-tag-type"; import { TerrainType } from "./terrain"; import { WeatherType } from "./weather"; import { BattleStat } from "./battle-stat"; -import { allAbilities } from "./ability" +import { allAbilities } from "./ability"; export enum BattlerTagLapseType { FAINT, @@ -117,7 +117,10 @@ export class TrappedTag extends BattlerTag { } canAdd(pokemon: Pokemon): boolean { - return !pokemon.isOfType(Type.GHOST) && !pokemon.getTag(BattlerTagType.TRAPPED); + const isGhost = pokemon.isOfType(Type.GHOST); + const isTrapped = pokemon.getTag(BattlerTagType.TRAPPED); + + return !isTrapped && !isGhost; } onAdd(pokemon: Pokemon): void { @@ -232,7 +235,7 @@ export class ConfusedTag extends BattlerTag { pokemon.scene.queueMessage(getPokemonMessage(pokemon, ' is\nconfused!')); pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION)); - if (pokemon.randSeedInt(2)) { + if (pokemon.randSeedInt(3)) { const atk = pokemon.getBattleStat(Stat.ATK); const def = pokemon.getBattleStat(Stat.DEF); const damage = Math.ceil(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100)); @@ -498,11 +501,26 @@ export class HelpingHandTag extends BattlerTag { } } +/** + * Applies the Ingrain tag to a pokemon + * @extends TrappedTag + */ export class IngrainTag extends TrappedTag { constructor(sourceId: integer) { super(BattlerTagType.INGRAIN, BattlerTagLapseType.TURN_END, 1, Moves.INGRAIN, sourceId); } + /** + * Check if the Ingrain tag can be added to the pokemon + * @param pokemon {@linkcode Pokemon} The pokemon to check if the tag can be added to + * @returns boolean True if the tag can be added, false otherwise + */ + canAdd(pokemon: Pokemon): boolean { + const isTrapped = pokemon.getTag(BattlerTagType.TRAPPED); + + return !isTrapped; + } + lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType); diff --git a/src/data/berry.ts b/src/data/berry.ts index 96b50caa932..1521f3488ef 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -7,6 +7,7 @@ import { BattlerTagType } from "./enums/battler-tag-type"; import { getStatusEffectHealText } from "./status-effect"; import * as Utils from "../utils"; import { DoubleBerryEffectAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs } from "./ability"; +import i18next from '../plugins/i18n'; export enum BerryType { SITRUS, @@ -22,32 +23,12 @@ export enum BerryType { LEPPA } -export function getBerryName(berryType: BerryType) { - return `${Utils.toReadableString(BerryType[berryType])} Berry`; +export function getBerryName(berryType: BerryType): string { + return i18next.t(`berry:${BerryType[berryType]}.name`); } -export function getBerryEffectDescription(berryType: BerryType) { - switch (berryType) { - case BerryType.SITRUS: - return 'Restores 25% HP if HP is below 50%'; - case BerryType.LUM: - return 'Cures any non-volatile status condition and confusion'; - case BerryType.ENIGMA: - return 'Restores 25% HP if hit by a super effective move'; - case BerryType.LIECHI: - case BerryType.GANLON: - case BerryType.PETAYA: - case BerryType.APICOT: - case BerryType.SALAC: - const stat = (berryType - BerryType.LIECHI) as BattleStat; - return `Raises ${getBattleStatName(stat)} if HP is below 25%`; - case BerryType.LANSAT: - return 'Raises critical hit ratio if HP is below 25%'; - case BerryType.STARF: - return 'Sharply raises a random stat if HP is below 25%'; - case BerryType.LEPPA: - return 'Restores 10 PP to a move if its PP reaches 0'; - } +export function getBerryEffectDescription(berryType: BerryType): string { + return i18next.t(`berry:${BerryType[berryType]}.effect`); } export type BerryPredicate = (pokemon: Pokemon) => boolean; diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index 055e5627a52..8d1be662f73 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -909,7 +909,8 @@ export const trainerTypeDialogue = { }, [TrainerType.MORTY]: { encounter: [ - `With a little more, I could see a future in which I meet the legendary Pokémon. You're going to help me reach that level!`, + `With a little more, I could see a future in which I meet the legendary Pokémon. + $You're going to help me reach that level!`, `It's said that a rainbow-hued Pokémon will come down to appear before a truly powerful Trainer. $I believed that tale, so I have secretly trained here all my life. As a result, I can now see what others cannot. $I see a shadow of the person who will make the Pokémon appear. @@ -924,7 +925,8 @@ export const trainerTypeDialogue = { `I see… Your journey has taken you to far-away places and you have witnessed much more than I. $I envy you for that…`, `How is this possible…`, - `I don't think our potentials are so different. But you seem to have something more than that… So be it.`, + `I don't think our potentials are so different. + $But you seem to have something more than that… So be it.`, `Guess I need more training.`, `That's a shame.` ], @@ -2290,6 +2292,25 @@ export const battleSpecDialogue = { } }; +export const miscDialogue = { + ending: [ + `@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now. + $@c{smile}It's over.@d{64} You ended the loop. + $@c{serious_smile_fists}You fulfilled your dream too, didn't you?\nYou didn't lose even once. + $@c{neutral}I'm the only one who'll remember what you did.@d{96}\nI guess that's okay, isn't it? + $@c{serious_smile_fists}Your legend will always live on in our hearts. + $@c{smile_eclosed}Anyway, I've had about enough of this place, haven't you? Let's head home. + $@c{serious_smile_fists}Maybe when we get back, we can have another battle?\nIf you're up to it.`, + `@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you. + $@c{smile_eclosed}Of course… I always had that feeling.\n@c{smile}It's over now, right? You ended the loop. + $@c{smile_ehalf}You fulfilled your dream too, didn't you?\nYou didn't lose even once. + $I'll be the only one to remember what you did.\n@c{angry_mopen}I'll try not to forget! + $@c{smile_wave_wink}Just kidding!@d{64} @c{smile}I'd never forget.@d{32}\nYour legend will live on in our hearts. + $@c{smile_wave}Anyway,@d{64} it's getting late…@d{96} I think?\nIt's hard to tell in this place. + $Let's go home. @c{smile_wave_wink}Maybe tomorrow, we can have another battle, for old time's sake?` + ] +} + export function getCharVariantFromDialogue(message: string): string { const variantMatch = /@c\{(.*?)\}/.exec(message); if (variantMatch) diff --git a/src/data/move.ts b/src/data/move.ts index 5f255d0fd51..6849a0fe7ce 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1,6 +1,6 @@ import { Moves } from "./enums/moves"; import { ChargeAnim, MoveChargeAnim, initMoveAnim, loadMoveAnimAssets } from "./battle-anims"; -import { BattleEndPhase, MovePhase, NewBattlePhase, PartyStatusCurePhase, PokemonHealPhase, StatChangePhase, SwitchSummonPhase } from "../phases"; +import { BattleEndPhase, MoveEffectPhase, MovePhase, NewBattlePhase, PartyStatusCurePhase, PokemonHealPhase, StatChangePhase, SwitchSummonPhase } from "../phases"; import { BattleStat, getBattleStatName } from "./battle-stat"; import { EncoreTag } from "./battler-tags"; import { BattlerTagType } from "./enums/battler-tag-type"; @@ -33,22 +33,29 @@ export enum MoveCategory { } 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 taret 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 @@ -67,8 +74,8 @@ export enum MoveFlags { PUNCHING_MOVE = 1 << 8, SLICING_MOVE = 1 << 9, /** - * Indicates a move should be affected by {@link Abilities.RECKLESS} - * @see {@link Move.recklessMove()} + * Indicates a move should be affected by {@linkcode Abilities.RECKLESS} + * @see {@linkcode Move.recklessMove()} */ RECKLESS_MOVE = 1 << 10, BALLBOMB_MOVE = 1 << 11, @@ -277,10 +284,10 @@ export default class Move implements Localizable { } /** - * Sets the {@link MoveFlags.RECKLESS_MOVE} flag for the calling Move - * @see {@link Abilities.RECKLESS} - * @param {boolean} recklessMove The value to set the flag to - * @returns {Move} The {@link Move} that called this function + * Sets the {@linkcode MoveFlags.RECKLESS_MOVE} flag for the calling Move + * @see {@linkcode Abilities.RECKLESS} + * @param recklessMove The value to set the flag to + * @returns The {@linkcode Move} that called this function */ recklessMove(recklessMove?: boolean): this { this.setFlag(MoveFlags.RECKLESS_MOVE, recklessMove); @@ -435,11 +442,12 @@ export class SelfStatusMove extends Move { } /** - * Base class defining all {@link Move} Attributes + * Base class defining all {@linkcode Move} Attributes * @abstract + * @see {@linkcode apply} */ export abstract class MoveAttr { - /** Should this {@link Move} target the user? */ + /** Should this {@linkcode Move} target the user? */ public selfTarget: boolean; constructor(selfTarget: boolean = false) { @@ -448,13 +456,13 @@ export abstract class MoveAttr { /** * Applies move attributes - * @see {@link applyMoveAttrsInternal} + * @see {@linkcode applyMoveAttrsInternal} * @virtual - * @param user The {@link Pokemon} using the move - * @param target The target {@link Pokemon} of the move - * @param move The {@link Move} being used + * @param user {@linkcode Pokemon} using the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute * @param args Set of unique arguments needed by this attribute - * @returns true if the application succeeds + * @returns true if application of the ability succeeds */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise { return true; @@ -462,7 +470,7 @@ export abstract class MoveAttr { /** * @virtual - * @returns the {@link MoveCondition} or {@link MoveConditionFunc} for this {@link Move} + * @returns the {@linkcode MoveCondition} or {@linkcode MoveConditionFunc} for this {@linkcode Move} */ getCondition(): MoveCondition | MoveConditionFunc { return null; @@ -470,11 +478,11 @@ export abstract class MoveAttr { /** * @virtual - * @param user The {@link Pokemon} using the move - * @param target The target {@link Pokemon} of the move - * @param move The {@link Move} being used - * @param cancelled A {@link Utils.BooleanHolder} which stores if the move should fail - * @returns the string representing failure of this {@link Move} + * @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; @@ -482,7 +490,7 @@ export abstract class MoveAttr { /** * Used by the Enemy AI to rank an attack based on a given user - * @see {@link EnemyPokemon.getNextMove} + * @see {@linkcode EnemyPokemon.getNextMove} * @virtual */ getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { @@ -491,7 +499,7 @@ export abstract class MoveAttr { /** * Used by the Enemy AI to rank an attack based on a given target - * @see {@link EnemyPokemon.getNextMove} + * @see {@linkcode EnemyPokemon.getNextMove} * @virtual */ getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { @@ -509,9 +517,14 @@ export enum MoveEffectTrigger { /** Base class defining all Move Effect Attributes * @extends MoveAttr + * @see {@linkcode apply} */ export class MoveEffectAttr extends MoveAttr { + /** Defines when this effect should trigger in the move's effect order + * @see {@linkcode MoveEffectPhase.start} + */ public trigger: MoveEffectTrigger; + /** Should this effect only apply on the first hit? */ public firstHitOnly: boolean; constructor(selfTarget?: boolean, trigger?: MoveEffectTrigger, firstHitOnly: boolean = false) { @@ -521,20 +534,20 @@ export class MoveEffectAttr extends MoveAttr { } /** - * Determines whether the {@link Move}'s effects are valid to {@link apply} + * Determines whether the {@linkcode Move}'s effects are valid to {@linkcode apply} * @virtual - * @param user The {@link Pokemon} using the move - * @param target The target {@link Pokemon} of the move - * @param move The {@link Move} being used + * @param user {@linkcode Pokemon} using the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute * @param args Set of unique arguments needed by this attribute - * @returns true if the application succeeds + * @returns true if basic application of the ability attribute should be possible */ canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) { - return !!(this.selfTarget ? user.hp && !user.getTag(BattlerTagType.FRENZY) : target.hp) - && (this.selfTarget || !target.getTag(BattlerTagType.PROTECTED) || move.hasFlag(MoveFlags.IGNORE_PROTECT)); + return !! (this.selfTarget ? user.hp && !user.getTag(BattlerTagType.FRENZY) : target.hp) + && (this.selfTarget || !target.getTag(BattlerTagType.PROTECTED) || move.hasFlag(MoveFlags.IGNORE_PROTECT)); } - /** Applies move effects so long as they are able based on {@link canApply} */ + /** Applies move effects so long as they are able based on {@linkcode canApply} */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise { return this.canApply(user, target, move, args); } @@ -792,7 +805,7 @@ export class RecoilAttr extends MoveEffectAttr { /** * Attribute used for moves which self KO the user regardless if the move hits a target * @extends MoveEffectAttr - * @see {@link apply} + * @see {@linkcode apply} **/ export class SacrificialAttr extends MoveEffectAttr { constructor() { @@ -801,9 +814,9 @@ export class SacrificialAttr extends MoveEffectAttr { /** * Deals damage to the user equal to their current hp - * @param user Pokemon that used the move - * @param target The target of the move - * @param move Move with this attribute + * @param user {@linkcode Pokemon} that used the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute * @param args N/A * @returns true if the function succeeds **/ @@ -824,7 +837,7 @@ export class SacrificialAttr extends MoveEffectAttr { /** * Attribute used for moves which self KO the user but only if the move hits a target * @extends MoveEffectAttr - * @see {@link apply} + * @see {@linkcode apply} **/ export class SacrificialAttrOnHit extends MoveEffectAttr { constructor() { @@ -833,14 +846,13 @@ export class SacrificialAttrOnHit extends MoveEffectAttr { /** * Deals damage to the user equal to their current hp if the move lands - * @param user Pokemon that used the move - * @param target The target of the move - * @param move Move with this attribute + * @param user {@linkcode Pokemon} that used the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute * @param args N/A * @returns true if the function succeeds **/ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - // If the move fails to hit a target, then the user does not faint and the function returns false if (!super.apply(user, target, move, args)) return false; @@ -860,7 +872,9 @@ export class SacrificialAttrOnHit extends MoveEffectAttr { /** * Attribute used for moves which cut the user's Max HP in half. - * Triggers using POST_TARGET. + * Triggers using {@linkcode MoveEffectTrigger.POST_TARGET}. + * @extends MoveEffectAttr + * @see {@linkcode apply} */ export class HalfSacrificialAttr extends MoveEffectAttr { constructor() { @@ -869,9 +883,9 @@ export class HalfSacrificialAttr extends MoveEffectAttr { /** * Cut's the user's Max HP in half and displays the appropriate recoil message - * @param user Pokemon that used the move + * @param user {@linkcode Pokemon} that used the move * @param target N/A - * @param move Move with this attribute + * @param move {@linkcode Move} with this attribute * @param args N/A * @returns true if the function succeeds */ @@ -905,12 +919,12 @@ export enum MultiHitType { } /** - * Heals the user or target by {@link healRatio} depending on the value of {@link selfTarget} + * Heals the user or target by {@linkcode healRatio} depending on the value of {@linkcode selfTarget} * @extends MoveEffectAttr - * @see {@link apply} + * @see {@linkcode apply} */ export class HealAttr extends MoveEffectAttr { - /** The percentage of {@link Stat.HP} to heal */ + /** The percentage of {@linkcode Stat.HP} to heal */ private healRatio: number; /** Should an animation be shown? */ private showAnim: boolean; @@ -928,7 +942,7 @@ export class HealAttr extends MoveEffectAttr { } /** - * Creates a new {@link PokemonHealPhase}. + * Creates a new {@linkcode PokemonHealPhase}. * This heals the target and shows the appropriate message. */ addHealPhase(target: Pokemon, healRatio: number) { @@ -944,11 +958,13 @@ export class HealAttr extends MoveEffectAttr { /** * Cures the user's party of non-volatile status conditions, ie. Heal Bell, Aromatherapy - * @param {string} message Message to display after using move - * @param {Abilities} abilityCondition Skips mons with this ability, ie. Soundproof + * @extends MoveEffectAttr + * @see {@linkcode apply} */ export class PartyStatusCureAttr extends MoveEffectAttr { + /** Message to display after using move */ private message: string; + /** Skips mons with this ability, ie. Soundproof */ private abilityCondition: Abilities; constructor(message: string, abilityCondition: Abilities) { @@ -1000,19 +1016,23 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr { /** * Attribute used for moves which ignore type-based debuffs from weather, namely Hydro Steam. * Called during damage calculation after getting said debuff from getAttackTypeMultiplier in the Pokemon class. + * @extends MoveAttr + * @see {@linkcode apply} */ export class IgnoreWeatherTypeDebuffAttr extends MoveAttr { + /** The {@linkcode WeatherType} this move ignores */ public weather: WeatherType; + constructor(weather: WeatherType){ super(); this.weather = weather; } /** * Changes the type-based weather modifier if this move's power would be reduced by it - * @param user Pokemon that used the move + * @param user {@linkcode Pokemon} that used the move * @param target N/A - * @param move Move with this attribute - * @param args [0] Utils.NumberHolder for arenaAttackTypeMultiplier + * @param move {@linkcode Move} with this attribute + * @param args [0] {@linkcode Utils.NumberHolder} for arenaAttackTypeMultiplier * @returns true if the function succeeds */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { @@ -1072,15 +1092,15 @@ export class SandHealAttr extends WeatherHealAttr { } /** - * Heals the target or the user by either {@link normalHealRatio} or {@link boostedHealRatio} - * depending on the evaluation of {@link condition} + * Heals the target or the user by either {@linkcode normalHealRatio} or {@linkcode boostedHealRatio} + * depending on the evaluation of {@linkcode condition} * @extends HealAttr - * @see {@link apply} + * @see {@linkcode apply} */ export class BoostHealAttr extends HealAttr { - /** Healing received when {@link condition} is false */ + /** Healing received when {@linkcode condition} is false */ private normalHealRatio?: number; - /** Healing received when {@link condition} is true */ + /** Healing received when {@linkcode condition} is true */ private boostedHealRatio?: number; /** The lambda expression to check against when boosting the healing value */ private condition?: MoveConditionFunc; @@ -1093,9 +1113,9 @@ export class BoostHealAttr extends HealAttr { } /** - * @param user The Pokemon using this move - * @param target The target Pokemon of this move - * @param move This move + * @param user {@linkcode Pokemon} using the move + * @param target {@linkcode Pokemon} target of the move + * @param move {@linkcode Move} with this attribute * @param args N/A * @returns true if the move was successful */ @@ -1464,15 +1484,17 @@ export class BypassSleepAttr extends MoveAttr { /** * Attribute used for moves that bypass the burn damage reduction of physical moves, currently only facade * Called during damage calculation - * @param user N/A - * @param target N/A - * @param move Move with this attribute - * @param args Utils.BooleanHolder for burnDamageReductionCancelled - * @returns true if the function succeeds + * @extends MoveAttr + * @see {@linkcode apply} */ export class BypassBurnDamageReductionAttr extends MoveAttr { - - /** Prevents the move's damage from being reduced by burn */ + /** Prevents the move's damage from being reduced by burn + * @param user N/A + * @param target N/A + * @param move {@linkcode Move} with this attribute + * @param args [0] {@linkcode Utils.BooleanHolder} for burnDamageReductionCancelled + * @returns true if the function succeeds + */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { (args[0] as Utils.BooleanHolder).value = true; @@ -1900,7 +1922,7 @@ export class CopyStatsAttr extends MoveEffectAttr { target.updateInfo(); user.updateInfo(); - target.scene.queueMessage(getPokemonMessage(user, 'copied\n') + getPokemonMessage(target, `'s stat changes!`)); + target.scene.queueMessage(getPokemonMessage(user, ' copied\n') + getPokemonMessage(target, `'s stat changes!`)); return true; } @@ -2108,36 +2130,27 @@ export class WeightPowerAttr extends VariablePowerAttr { } } -export class BattleStatRatioPowerAttr extends VariablePowerAttr { - private stat: Stat; - private invert: boolean; - - constructor(stat: Stat, invert: boolean = false) { - super(); - - this.stat = stat; - this.invert = invert; - } - +/** + * Attribute used for Electro Ball move. + * @extends VariablePowerAttr + * @see {@linkcode apply} + **/ +export class ElectroBallPowerAttr extends VariablePowerAttr { + /** + * Move that deals more damage the faster {@linkcode BattleStat.SPD} + * the user is compared to the target. + * @param user Pokemon that used the move + * @param target The target of the move + * @param move Move with this attribute + * @param args N/A + * @returns true if the function succeeds + */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const power = args[0] as Utils.NumberHolder; - const statRatio = target.getStat(this.stat) / user.getStat(this.stat); + const statRatio = target.getBattleStat(Stat.SPD) / user.getBattleStat(Stat.SPD); const statThresholds = [ 0.25, 1 / 3, 0.5, 1, -1 ]; - let statThresholdPowers = [ 150, 120, 80, 60, 40 ]; - - if (this.invert) { - // Gyro ball uses a specific formula - let userSpeed = user.getBattleStat(this.stat); - if (userSpeed < 1) { - // Gen 6+ always have 1 base power - power.value = 1; - return true; - } - let bp = Math.floor(Math.min(150, 25 * target.getBattleStat(this.stat) / userSpeed + 1)); - power.value = bp; - return true; - } + const statThresholdPowers = [ 150, 120, 80, 60, 40 ]; let w = 0; while (w < statThresholds.length - 1 && statRatio > statThresholds[w]) { @@ -2146,7 +2159,36 @@ export class BattleStatRatioPowerAttr extends VariablePowerAttr { } power.value = statThresholdPowers[w]; + return true; + } +} + +/** + * Attribute used for Gyro Ball move. + * @extends VariablePowerAttr + * @see {@linkcode apply} + **/ +export class GyroBallPowerAttr extends VariablePowerAttr { + /** + * Move that deals more damage the slower {@linkcode BattleStat.SPD} + * the user is compared to the target. + * @param user Pokemon that used the move + * @param target The target of the move + * @param move Move with this attribute + * @param args N/A + * @returns true if the function succeeds + */ + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + const power = args[0] as Utils.NumberHolder; + const userSpeed = user.getBattleStat(Stat.SPD); + if (userSpeed < 1) { + // Gen 6+ always have 1 base power + power.value = 1; + return true; + } + + power.value = Math.floor(Math.min(150, 25 * target.getBattleStat(Stat.SPD) / userSpeed + 1)); return true; } } @@ -2482,16 +2524,19 @@ export class ThunderAccuracyAttr extends VariableAccuracyAttr { /** * Attribute used for moves which never miss - * against Pokemon with the {@link BattlerTagType.MINIMIZED} - * @see {@link apply} - * @param user N/A - * @param target Target of the move - * @param move N/A - * @param args [0] Accuracy of the move to be modified - * @returns true if the function succeeds + * against Pokemon with the {@linkcode BattlerTagType.MINIMIZED} + * @extends VariableAccuracyAttr + * @see {@linkcode apply} */ -export class MinimizeAccuracyAttr extends VariableAccuracyAttr{ - +export class MinimizeAccuracyAttr extends VariableAccuracyAttr { + /** + * @see {@linkcode apply} + * @param user N/A + * @param target {@linkcode Pokemon} target of the move + * @param move N/A + * @param args [0] Accuracy of the move to be modified + * @returns true if the function succeeds + */ apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { if (target.getTag(BattlerTagType.MINIMIZED)){ const accuracy = args[0] as Utils.NumberHolder @@ -3259,11 +3304,14 @@ export class FaintCountdownAttr extends AddBattlerTagAttr { } } -/** Attribute used when a move hits a {@link BattlerTagType} for double damage */ +/** + * Attribute used when a move hits a {@linkcode BattlerTagType} for double damage + * @extends MoveAttr +*/ export class HitsTagAttr extends MoveAttr { - /** The {@link BattlerTagType} this move hits */ + /** The {@linkcode BattlerTagType} this move hits */ public tagType: BattlerTagType; - /** Should this move deal double damage against {@link HitsTagAttr.tagType}? */ + /** Should this move deal double damage against {@linkcode HitsTagAttr.tagType}? */ public doubleDamage: boolean; constructor(tagType: BattlerTagType, doubleDamage?: boolean) { @@ -5361,7 +5409,7 @@ export function initMoves() { .attr(StatChangeAttr, BattleStat.SPD, -1, true) .punchingMove(), new AttackMove(Moves.GYRO_BALL, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 5, -1, 0, 4) - .attr(BattleStatRatioPowerAttr, Stat.SPD, true) + .attr(GyroBallPowerAttr) .ballBombMove(), new SelfStatusMove(Moves.HEALING_WISH, Type.PSYCHIC, -1, 10, -1, 0, 4) .attr(SacrificialFullRestoreAttr) @@ -5714,7 +5762,7 @@ export function initMoves() { .condition(unknownTypeCondition) .attr(hitsSameTypeAttr), new AttackMove(Moves.ELECTRO_BALL, Type.ELECTRIC, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 5) - .attr(BattleStatRatioPowerAttr, Stat.SPD) + .attr(ElectroBallPowerAttr) .ballBombMove(), new StatusMove(Moves.SOAK, Type.WATER, 100, 20, -1, 0, 5) .attr(ChangeTypeAttr, Type.WATER), diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index c8f99936941..218423d3232 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1504,7 +1504,7 @@ export function initSpecies() { 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, false, true, 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.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), 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), @@ -1931,7 +1931,7 @@ export function initSpecies() { 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, true, false, 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 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, ""), 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), 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, ""), @@ -2285,7 +2285,7 @@ export function initSpecies() { 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, true, false, 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 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), 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), @@ -2453,10 +2453,10 @@ export function initSpecies() { 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, false, true, 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, false, true, 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, false, true, 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, false, true, 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 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), 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), diff --git a/src/data/pokemon-stat.ts b/src/data/pokemon-stat.ts index b22eaefe876..94e710c981b 100644 --- a/src/data/pokemon-stat.ts +++ b/src/data/pokemon-stat.ts @@ -13,22 +13,22 @@ export function getStatName(stat: Stat, shorten: boolean = false) { let ret: string; switch (stat) { case Stat.HP: - ret = !shorten ? i18next.t('pokemonStat:HP') : i18next.t('pokemonStat:HPshortened'); + ret = !shorten ? i18next.t('pokemonInfo:Stat.HP') : i18next.t('pokemonInfo:Stat.HPshortened'); break; case Stat.ATK: - ret = !shorten ? i18next.t('pokemonStat:ATK') : i18next.t('pokemonStat:ATKshortened'); + ret = !shorten ? i18next.t('pokemonInfo:Stat.ATK') : i18next.t('pokemonInfo:Stat.ATKshortened'); break; case Stat.DEF: - ret = !shorten ? i18next.t('pokemonStat:DEF') : i18next.t('pokemonStat:DEFshortened'); + ret = !shorten ? i18next.t('pokemonInfo:Stat.DEF') : i18next.t('pokemonInfo:Stat.DEFshortened'); break; case Stat.SPATK: - ret = !shorten ? i18next.t('pokemonStat:SPATK') : i18next.t('pokemonStat:SPATKshortened'); + ret = !shorten ? i18next.t('pokemonInfo:Stat.SPATK') : i18next.t('pokemonInfo:Stat.SPATKshortened'); break; case Stat.SPDEF: - ret = !shorten ? i18next.t('pokemonStat:SPDEF') : i18next.t('pokemonStat:SPDEFshortened'); + ret = !shorten ? i18next.t('pokemonInfo:Stat.SPDEF') : i18next.t('pokemonInfo:Stat.SPDEFshortened'); break; case Stat.SPD: - ret = !shorten ? i18next.t('pokemonStat:SPD') : i18next.t('pokemonStat:SPDshortened'); + ret = !shorten ? i18next.t('pokemonInfo:Stat.SPD') : i18next.t('pokemonInfo:Stat.SPDshortened'); break; } return ret; diff --git a/src/data/splash-messages.ts b/src/data/splash-messages.ts index 3a40429e9b6..c650b038287 100644 --- a/src/data/splash-messages.ts +++ b/src/data/splash-messages.ts @@ -8,14 +8,14 @@ export function getSplashMessages(): string[] { const splashMessages = Array(10).fill(getBattleCountSplashMessage()); splashMessages.push(...[ i18next.t('splashMessages:joinTheDiscord'), - i18next.t('splashMessages:infiniteLevel'), + i18next.t('splashMessages:infiniteLevels'), i18next.t('splashMessages:everythingStacks'), i18next.t('splashMessages:optionalSaveScumming'), i18next.t('splashMessages:biomes'), i18next.t('splashMessages:openSource'), - i18next.t('splashMessages:playWith5xSpeed'), + i18next.t('splashMessages:playWithSpeed'), i18next.t('splashMessages:liveBugTesting'), - i18next.t('splashMessages:heavyRoR2Influence'), + i18next.t('splashMessages:heavyInfluence'), i18next.t('splashMessages:pokemonRiskAndPokemonRain'), i18next.t('splashMessages:nowWithMoreSalt'), i18next.t('splashMessages:infiniteFusionAtHome'), diff --git a/src/data/tms.ts b/src/data/tms.ts index eeccd9310a3..1eff9102c4c 100644 --- a/src/data/tms.ts +++ b/src/data/tms.ts @@ -20889,7 +20889,6 @@ export const tmSpecies: TmSpecies = { Species.BAGON, Species.SHELGON, Species.SALAMENCE, - Species.METANG, Species.METAGROSS, Species.REGIROCK, Species.REGICE, @@ -32522,6 +32521,8 @@ export const tmSpecies: TmSpecies = { Species.DUSCLOPS, Species.CHIMECHO, Species.ABSOL, + Species.METANG, + Species.METAGROSS, Species.LATIAS, Species.LATIOS, Species.JIRACHI, @@ -35468,6 +35469,8 @@ export const tmSpecies: TmSpecies = { Species.ZANGOOSE, Species.KECLEON, Species.DUSCLOPS, + Species.METANG, + Species.METAGROSS, Species.REGIROCK, Species.REGICE, Species.REGISTEEL, @@ -37725,6 +37728,7 @@ export const tmSpecies: TmSpecies = { Species.BANETTE, Species.CHIMECHO, Species.ABSOL, + Species.METAGROSS, [ Species.DEOXYS, '', @@ -47702,6 +47706,7 @@ export const tmSpecies: TmSpecies = { Species.GOREBYSS, Species.RELICANTH, Species.SALAMENCE, + Species.METANG, Species.METAGROSS, Species.REGIROCK, Species.REGICE, @@ -48471,6 +48476,7 @@ export const tmSpecies: TmSpecies = { Species.BAGON, Species.SHELGON, Species.SALAMENCE, + Species.METAGROSS, Species.REGISTEEL, Species.LATIAS, Species.LATIOS, @@ -50632,6 +50638,7 @@ export const tmSpecies: TmSpecies = { Species.ABSOL, Species.RELICANTH, Species.SALAMENCE, + Species.METAGROSS, Species.REGIROCK, Species.GROUDON, Species.RAYQUAZA, @@ -52586,6 +52593,8 @@ export const tmSpecies: TmSpecies = { Species.CAMERUPT, Species.TORKOAL, Species.WALREIN, + Species.METANG, + Species.METAGROSS, Species.REGIROCK, Species.REGICE, Species.REGISTEEL, @@ -62371,6 +62380,7 @@ export const tmSpecies: TmSpecies = { Species.BAGON, Species.SHELGON, Species.SALAMENCE, + Species.BELDUM, Species.METANG, Species.METAGROSS, Species.REGIROCK, @@ -63367,6 +63377,8 @@ export const tmSpecies: TmSpecies = { Species.TROPIUS, Species.SNORUNT, Species.GLALIE, + Species.METANG, + Species.METAGROSS, Species.TURTWIG, Species.GROTLE, Species.TORTERRA, diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 270a314a251..0e5936b9799 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -399,6 +399,9 @@ export class TrainerConfig { } initForGymLeader(signatureSpecies: (Species | Species[])[], ...specialtyTypes: Type[]): TrainerConfig { + if (!getIsInitialized()) { + initI18n(); + } this.setPartyTemplateFunc(getGymLeaderPartyTemplate); signatureSpecies.forEach((speciesPool, s) => { @@ -431,7 +434,9 @@ export class TrainerConfig { } initForEliteFour(signatureSpecies: (Species | Species[])[], ...specialtyTypes: Type[]): TrainerConfig { - + if (!getIsInitialized()) { + initI18n(); + } this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR); signatureSpecies.forEach((speciesPool, s) => { @@ -459,7 +464,9 @@ export class TrainerConfig { } initForChampion(signatureSpecies: (Species | Species[])[]): TrainerConfig { - + if (!getIsInitialized()) { + initI18n(); + } this.setPartyTemplates(trainerPartyTemplates.CHAMPION); signatureSpecies.forEach((speciesPool, s) => { if (!Array.isArray(speciesPool)) @@ -498,7 +505,7 @@ export class TrainerConfig { initI18n(); } // Check if the female version exists in the i18n file - if (i18next.exists(`trainerClasses:${this.name.toLowerCase().replace}`)) { + if (i18next.exists(`trainerClasses:${this.name.toLowerCase().replace()}`)) { // If it does, return return ret + "_female"; } else { @@ -824,7 +831,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.BRASSIUS]: new TrainerConfig(++t).initForGymLeader([ Species.SMOLIV, Species.SHROOMISH, Species.ODDISH ], Type.GRASS), [TrainerType.IONO]: new TrainerConfig(++t).initForGymLeader([ Species.TADBULB, Species.WATTREL, Species.VOLTORB ], Type.ELECTRIC), [TrainerType.KOFU]: new TrainerConfig(++t).initForGymLeader([ Species.VELUZA, Species.WIGLETT, Species.WINGULL ], Type.WATER), - [TrainerType.LARRY]: new TrainerConfig(++t).initForGymLeader([ Species.STARLY, Species.DUNSPARCE, Species.KOMALA ], Type.NORMAL), + [TrainerType.LARRY]: new TrainerConfig(++t).setName("Larry").initForGymLeader([ Species.STARLY, Species.DUNSPARCE, Species.KOMALA ], Type.NORMAL), [TrainerType.RYME]: new TrainerConfig(++t).initForGymLeader([ Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU ], Type.GHOST), [TrainerType.TULIP]: new TrainerConfig(++t).initForGymLeader([ Species.GIRAFARIG, Species.FLITTLE, Species.RALTS ], Type.PSYCHIC), [TrainerType.GRUSHA]: new TrainerConfig(++t).initForGymLeader([ Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO ], Type.ICE), @@ -832,7 +839,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.LORELEI]: new TrainerConfig((t = TrainerType.LORELEI)).initForEliteFour([ Species.SLOWBRO, Species.LAPRAS, Species.DEWGONG, Species.ALOLA_SANDSLASH ], Type.ICE), [TrainerType.BRUNO]: new TrainerConfig(++t).initForEliteFour([ Species.ONIX, Species.HITMONCHAN, Species.HITMONLEE, Species.ALOLA_GOLEM ], Type.FIGHTING), [TrainerType.AGATHA]: new TrainerConfig(++t).initForEliteFour([ Species.GENGAR, Species.ARBOK, Species.CROBAT, Species.ALOLA_MAROWAK ], Type.GHOST), - [TrainerType.LANCE]: new TrainerConfig(++t).initForEliteFour([ Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR ], Type.DRAGON), + [TrainerType.LANCE]: new TrainerConfig(++t).setName("Lance").initForEliteFour([ Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR ], Type.DRAGON), [TrainerType.WILL]: new TrainerConfig(++t).initForEliteFour([ Species.XATU, Species.JYNX, Species.SLOWBRO, Species.EXEGGUTOR ], Type.PSYCHIC), [TrainerType.KOGA]: new TrainerConfig(++t).initForEliteFour([ Species.WEEZING, Species.VENOMOTH, Species.CROBAT, Species.TENTACRUEL ], Type.POISON), [TrainerType.KAREN]: new TrainerConfig(++t).initForEliteFour([ Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE ], Type.DARK), @@ -859,7 +866,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.KAHILI]: new TrainerConfig(++t).initForEliteFour([ Species.BRAVIARY, Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON ], Type.FLYING), [TrainerType.RIKA]: new TrainerConfig(++t).initForEliteFour([ Species. WHISCASH, Species.DONPHAN, Species.CAMERUPT, Species.CLODSIRE ], Type.GROUND), [TrainerType.POPPY]: new TrainerConfig(++t).initForEliteFour([ Species.COPPERAJAH, Species.BRONZONG, Species.CORVIKNIGHT, Species.TINKATON ], Type.STEEL), - [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).initForEliteFour([ Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS ], Type.NORMAL, Type.FLYING), + [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).setName("Larry").initForEliteFour([ Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS ], Type.NORMAL, Type.FLYING), [TrainerType.HASSEL]: new TrainerConfig(++t).initForEliteFour([ Species.NOIVERN, Species.HAXORUS, Species.DRAGALGE, Species.BAXCALIBUR ], Type.DRAGON), [TrainerType.CRISPIN]: new TrainerConfig(++t).initForEliteFour([ Species.TALONFLAME, Species.CAMERUPT, Species.MAGMORTAR, Species.BLAZIKEN ], Type.FIRE), [TrainerType.AMARYS]: new TrainerConfig(++t).initForEliteFour([ Species.SKARMORY, Species.EMPOLEON, Species.SCIZOR, Species.METAGROSS ], Type.STEEL), @@ -868,7 +875,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE)).initForChampion([ Species.GYARADOS, Species.MEWTWO, Species.ARCANINE, Species.ALAKAZAM, Species.PIDGEOT ]).setBattleBgm('battle_kanto_champion'), [TrainerType.RED]: new TrainerConfig(++t).initForChampion([ Species.CHARIZARD, [ Species.LUGIA, Species.HO_OH ], Species.SNORLAX, Species.RAICHU, Species.ESPEON ]).setBattleBgm('battle_johto_champion'), - [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t).initForChampion([ Species.DRAGONITE, Species.ZYGARDE, Species.AERODACTYL, Species.KINGDRA, Species.ALOLA_EXEGGUTOR ]).setBattleBgm('battle_johto_champion'), + [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t).setName("Lance").initForChampion([ Species.DRAGONITE, Species.ZYGARDE, Species.AERODACTYL, Species.KINGDRA, Species.ALOLA_EXEGGUTOR ]).setBattleBgm('battle_johto_champion'), [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion([ Species.METAGROSS, [ Species.DIALGA, Species.PALKIA ], Species.SKARMORY, Species.AGGRON, Species.CARBINK ]).setBattleBgm('battle_hoenn_champion'), [TrainerType.WALLACE]: new TrainerConfig(++t).initForChampion([ Species.MILOTIC, Species.KYOGRE, Species.WHISCASH, Species.WALREIN, Species.LUDICOLO ]).setBattleBgm('battle_hoenn_champion'), [TrainerType.CYNTHIA]: new TrainerConfig(++t).initForChampion([ Species.SPIRITOMB, Species.GIRATINA, Species.GARCHOMP, Species.MILOTIC, Species.LUCARIO, Species.TOGEKISS ]).setBattleBgm('battle_sinnoh_champion'), diff --git a/src/data/weather.ts b/src/data/weather.ts index eb30f22f36b..c8bd47fc12d 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -1,5 +1,5 @@ import { Biome } from "./enums/biome"; -import { getPokemonMessage } from "../messages"; +import { getPokemonMessage, getPokemonPrefix } from "../messages"; import Pokemon from "../field/pokemon"; import { Type } from "./type"; import Move, { AttackMove } from "./move"; @@ -172,9 +172,9 @@ export function getWeatherLapseMessage(weatherType: WeatherType): string { export function getWeatherDamageMessage(weatherType: WeatherType, pokemon: Pokemon): string { switch (weatherType) { case WeatherType.SANDSTORM: - return getPokemonMessage(pokemon, ' is buffeted\nby the sandstorm!'); + return i18next.t('weather:sandstormDamageMessage', {pokemonPrefix: getPokemonPrefix(pokemon), pokemonName: pokemon.name}); case WeatherType.HAIL: - return getPokemonMessage(pokemon, ' is pelted\nby the hail!'); + return i18next.t('weather:hailDamageMessage', {pokemonPrefix: getPokemonPrefix(pokemon), pokemonName: pokemon.name}); } return null; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index eb08af3da55..e25fbe5fa71 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -329,9 +329,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (variantSet && variantSet[this.variant] === 1) { if (variantColorCache.hasOwnProperty(key)) return resolve(); - this.scene.cachedFetch(`./images/pokemon/variant/${useExpSprite ? 'exp/' : ''}${battleSpritePath}.json`).then(res => res.json()).then(c => { - variantColorCache[key] = c; - resolve(); + this.scene.cachedFetch(`./images/pokemon/variant/${useExpSprite ? 'exp/' : ''}${battleSpritePath}.json`). + then(res => { + // Prevent the JSON from processing if it failed to load + if (!res.ok) { + console.error(`Could not load ${res.url}!`); + return; + } + res.json() + }).then(c => { + variantColorCache[key] = c; + resolve(); }); } else resolve(); @@ -493,9 +501,31 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.shinySparkle = shinySparkle; } + /** + * Attempts to animate a given {@linkcode Phaser.GameObjects.Sprite} + * @see {@linkcode Phaser.GameObjects.Sprite.play} + * @param sprite {@linkcode Phaser.GameObjects.Sprite} to animate + * @param tintSprite {@linkcode Phaser.GameObjects.Sprite} placed on top of the sprite to add a color tint + * @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 { + // 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); + + return false; + } + + return true; + } + playAnim(): void { - this.getSprite().play(this.getBattleSpriteKey()); - this.getTintSprite().play(this.getBattleSpriteKey()); + this.tryPlaySprite(this.getSprite(), this.getTintSprite(), this.getBattleSpriteKey()); } getFieldPositionOffset(): [ number, number ] { @@ -1096,8 +1126,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let shinyThreshold = new Utils.IntegerHolder(32); if (thresholdOverride === undefined) { - if (!this.hasTrainer()) + if (!this.hasTrainer()) { + if (new Date() < new Date('2024-05-21')) + shinyThreshold.value *= 3; this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + } } else shinyThreshold.value = thresholdOverride; diff --git a/src/field/trainer.ts b/src/field/trainer.ts index 9213dc0135d..60497239488 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -370,6 +370,34 @@ export default class Trainer extends Phaser.GameObjects.Container { this.getTintSprites().map((tintSprite, i) => tintSprite.setTexture(this.getKey(!!i)).setFrame(0)); } + /** + * Attempts to animate a given set of {@linkcode Phaser.GameObjects.Sprite} + * @see {@linkcode Phaser.GameObjects.Sprite.play} + * @param sprite {@linkcode Phaser.GameObjects.Sprite} to animate + * @param tintSprite {@linkcode Phaser.GameObjects.Sprite} placed on top of the sprite to add a color tint + * @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 { + // 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}'!`); + + return false; + } + // Don't try to play an animation when there isn't one + if (sprite.texture.frameTotal <= 1) { + console.warn(`No animation found for '${animConfig.key}'. Is this intentional?`); + + return false; + } + + sprite.play(animConfig); + tintSprite.play(animConfig); + + return true; + } + playAnim(): void { const trainerAnimConfig = { key: this.getKey(), @@ -378,16 +406,18 @@ export default class Trainer extends Phaser.GameObjects.Container { }; const sprites = this.getSprites(); const tintSprites = this.getTintSprites(); - sprites[0].play(trainerAnimConfig); - tintSprites[0].play(trainerAnimConfig); + + this.tryPlaySprite(sprites[0], tintSprites[0], trainerAnimConfig); + + // Queue an animation for the second trainer if this is a double battle against two separate trainers if (this.variant === TrainerVariant.DOUBLE && !this.config.doubleOnly) { const partnerTrainerAnimConfig = { key: this.getKey(true), repeat: 0, startFrame: 0 }; - sprites[1].play(partnerTrainerAnimConfig); - tintSprites[1].play(partnerTrainerAnimConfig); + + this.tryPlaySprite(sprites[1], tintSprites[1], partnerTrainerAnimConfig); } } diff --git a/src/loading-scene.ts b/src/loading-scene.ts index a49fed480e6..56d0ab47f13 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -209,6 +209,9 @@ export class LoadingScene extends SceneBase { this.loadImage('egg_list_bg', 'ui'); + this.loadImage('end_m', 'cg'); + this.loadImage('end_f', 'cg'); + for (let i = 0; i < 10; i++) { this.loadAtlas(`pokemon_icons_${i}`, ''); if (i) diff --git a/src/locales/de/battle-message-ui-handler.ts b/src/locales/de/battle-message-ui-handler.ts new file mode 100644 index 00000000000..daedb8550d0 --- /dev/null +++ b/src/locales/de/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "Sensationell", + "ivFantastic": "Fantastisch", + "ivVeryGood": "Sehr Gut", + "ivPrettyGood": "Gut", + "ivDecent": "Nicht Übel", + "ivNoGood": "Schlecht", +} as const; diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts index 687c60129cc..5504e541be0 100644 --- a/src/locales/de/battle.ts +++ b/src/locales/de/battle.ts @@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} erscheint.", "trainerAppeared": "{{trainerName}}\nmöchte kämpfen!", + "trainerAppearedDouble": "{{trainerName}}\nmöchten kämpfen!", "singleWildAppeared": "Ein wildes {{pokemonName}} erscheint!", "multiWildAppeared": "Ein wildes {{pokemonName1}}\nund {{pokemonName2}} erscheinen!", "playerComeBack": "Komm zurück, {{pokemonName}}!", diff --git a/src/locales/de/berry.ts b/src/locales/de/berry.ts new file mode 100644 index 00000000000..bba64597f6b --- /dev/null +++ b/src/locales/de/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "Tsitrubeere", + effect: "Stellt 25% der KP wieder her, wenn die KP unter 50% sind" + }, + "LUM": { + name: "Prunusbeere", + effect: "Heilt jede nichtflüchtige Statusveränderung und Verwirrung" + }, + "ENIGMA": { + name: "Enigmabeere", + effect: "Stellt 25% der KP wieder her, wenn der Träger von einer sehr effektiven Attacke getroffen wird", + }, + "LIECHI": { + name: "Lydzibeere", + effect: "Steigert den Angriff, wenn die KP unter 25% sind" + }, + "GANLON": { + name: "Linganbeere", + effect: "Steigert die Verteidigung, wenn die KP unter 25% sind" + }, + "PETAYA": { + name: "Tahaybeere", + effect: "Steigert den Spezial-Angriff, wenn die KP unter 25% sind" + }, + "APICOT": { + name: "Apikobeere", + effect: "Steigert die Spezial-Verteidigung, wenn die KP unter 25% sind" + }, + "SALAC": { + name: "Salkabeere", + effect: "Steigert die Initiative, wenn die KP unter 25% sind" + }, + "LANSAT": { + name: "Lansatbeere", + effect: "Erhöht die Volltrefferchance, wenn die KP unter 25% sind" + }, + "STARF": { + name: "Krambobeere", + effect: "Erhöht eine Statuswert stark, wenn die KP unter 25% sind" + }, + "LEPPA": { + name: "Jonagobeere", + effect: "Stellt 10 AP für eine Attacke wieder her, wenn deren AP auf 0 fallen" + }, +} as const; \ No newline at end of file diff --git a/src/locales/de/config.ts b/src/locales/de/config.ts index c9a58bca1ea..af52d8bc51b 100644 --- a/src/locales/de/config.ts +++ b/src/locales/de/config.ts @@ -12,12 +12,14 @@ import { move } from "./move"; import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; -import { titles,trainerClasses,trainerNames } from "./trainers"; -import { splashMessages } from "./splash-messages" - +import { weather } from "./weather"; +import { battleMessageUiHandler } from "./battle-message-ui-handler"; +import { berry } from "./berry"; export const deConfig = { ability: ability, @@ -26,19 +28,22 @@ export const deConfig = { commandUiHandler: commandUiHandler, egg: egg, fightUiHandler: fightUiHandler, - menuUiHandler: menuUiHandler, + growth: growth, menu: menu, + menuUiHandler: menuUiHandler, + modifierType: modifierType, move: move, + nature: nature, pokeball: pokeball, - pokemonStat: pokemonStat, pokemon: pokemon, + pokemonInfo: pokemonInfo, + splashMessages: splashMessages, starterSelectUiHandler: starterSelectUiHandler, titles: titles, trainerClasses: trainerClasses, trainerNames: trainerNames, tutorial: tutorial, - splashMessages: splashMessages, - nature: nature, - growth: growth, - modifierType: modifierType, -} + weather: weather, + battleMessageUiHandler: battleMessageUiHandler, + berry: berry, +} \ No newline at end of file diff --git a/src/locales/de/menu.ts b/src/locales/de/menu.ts index 7d96f9130eb..0d33fb4cbd8 100644 --- a/src/locales/de/menu.ts +++ b/src/locales/de/menu.ts @@ -12,10 +12,10 @@ export const menu: SimpleTranslationEntries = { "loadGame": "Spiel laden", "newGame": "Neues Spiel", "selectGameMode": "Wähle einen Spielmodus", - "logInOrCreateAccount": "Logge dich ein oder erstelle einen Account zum starten. Keine Email nötig!", + "logInOrCreateAccount": "Melde dich an oder erstelle einen Account zum starten. Keine Email nötig!", "username": "Benutzername", "password": "Passwort", - "login": "Einloggen", + "login": "Anmelden", "register": "Registrieren", "emptyUsername": "Benutzername darf nicht leer sein", "invalidLoginUsername": "Der eingegebene Benutzername ist ungültig", @@ -26,20 +26,20 @@ export const menu: SimpleTranslationEntries = { "accountNonExistent": "Der eingegebene Benutzer existiert nicht", "unmatchingPassword": "Das eingegebene Passwort stimmt nicht überein", "passwordNotMatchingConfirmPassword": "Passwort muss mit Bestätigungspasswort übereinstimmen", - "confirmPassword": "Besätige Passwort", + "confirmPassword": "Bestätige Passwort", "registrationAgeWarning": "Mit der Registrierung bestätigen Sie, dass Sie 13 Jahre oder älter sind.", - "backToLogin": "Zurück zum Einloggen", + "backToLogin": "Zurück zur Anmeldung", "failedToLoadSaveData": "Speicherdaten konnten nicht geladen werden. Bitte laden Sie die Seite neu.\nWenn dies weiterhin der Fall ist, wenden Sie sich bitte an den Administrator.", "sessionSuccess": "Sitzung erfolgreich geladen.", "failedToLoadSession": "Ihre Sitzungsdaten konnten nicht geladen werden.\nSie könnten beschädigt sein.", "boyOrGirl": "Bist du ein Junge oder ein Mädchen?", "boy": "Junge", "girl": "Mädchen", - "evolving": "What?\n{{pokemonName}} is evolving!", - "stoppedEvolving": "{{pokemonName}} stopped evolving.", - "pauseEvolutionsQuestion": "Would you like to pause evolutions for {{pokemonName}}?\nEvolutions can be re-enabled from the party screen.", - "evolutionsPaused": "Evolutions have been paused for {{pokemonName}}.", - "evolutionDone": "Congratulations!\nYour {{pokemonName}} evolved into {{evolvedPokemonName}}!", + "evolving": "Nanu?\n{{pokemonName}} entwickelt sich!", + "stoppedEvolving": "Hm? {{pokemonName}} hat die Entwicklung \nabgebrochen.", // "Hm? Entwicklung wurde abgebrochen!" without naming the pokemon seems to be the original. + "pauseEvolutionsQuestion": "Die Entwicklung von {{pokemonName}} vorübergehend pausieren?\nEntwicklungen können im Gruppenmenü wieder aktiviert werden.", + "evolutionsPaused": "Entwicklung von {{pokemonName}} pausiert.", + "evolutionDone": "Glückwunsch!\nDein {{pokemonName}} entwickelte sich zu {{evolvedPokemonName}}!", "dailyRankings": "Tägliche Rangliste", "weeklyRankings": "Wöchentliche Rangliste", "noRankings": "Keine Rangliste", @@ -48,4 +48,4 @@ export const menu: SimpleTranslationEntries = { "empty":"Leer", "yes":"Ja", "no":"Nein", -} as const; \ No newline at end of file +} as const; diff --git a/src/locales/de/modifier-type.ts b/src/locales/de/modifier-type.ts index dea1421ac20..5006ee294f6 100644 --- a/src/locales/de/modifier-type.ts +++ b/src/locales/de/modifier-type.ts @@ -55,7 +55,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "Erhöht die {{tempBattleStatName}} aller Teammitglieder für 5 Kämpfe um eine Stufe", }, "AttackTypeBoosterModifierType": { - description: "Erhöht die Stärke aller {{moveType}}attacken eines Pokémon um 20%", + description: "Erhöht die Stärke aller {{moveType}}-Attacken eines Pokémon um 20%", }, "PokemonLevelIncrementModifierType": { description: "Erhöht das Level eines Pokémon um 1", @@ -385,26 +385,4 @@ export const modifierType: ModifierTypeTranslationEntries = { "CHILL_DRIVE": "Gefriermodul", "DOUSE_DRIVE": "Aquamodul", }, - TeraType: { - "UNKNOWN": "Unbekannt", - "NORMAL": "Normal", - "FIGHTING": "Kampf", - "FLYING": "Flug", - "POISON": "Gift", - "GROUND": "Boden", - "ROCK": "Gestein", - "BUG": "Käfer", - "GHOST": "Geist", - "STEEL": "Stahl", - "FIRE": "Feuer", - "WATER": "Wasser", - "GRASS": "Pflanze", - "ELECTRIC": "Elektro", - "PSYCHIC": "Psycho", - "ICE": "Eis", - "DRAGON": "Drache", - "DARK": "Unlicht", - "FAIRY": "Fee", - "STELLAR": "Stellar", - }, } as const; \ No newline at end of file diff --git a/src/locales/de/pokemon-info.ts b/src/locales/de/pokemon-info.ts new file mode 100644 index 00000000000..772a09cb656 --- /dev/null +++ b/src/locales/de/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "Max. KP", + "HPshortened": "MaxKP", + "ATK": "Angriff", + "ATKshortened": "Ang", + "DEF": "Verteidigung", + "DEFshortened": "Vert", + "SPATK": "Sp. Ang", + "SPATKshortened": "SpAng", + "SPDEF": "Sp. Vert", + "SPDEFshortened": "SpVert", + "SPD": "Initiative", + "SPDshortened": "Init", + }, + + Type: { + "UNKNOWN": "Unbekannt", + "NORMAL": "Normal", + "FIGHTING": "Kampf", + "FLYING": "Flug", + "POISON": "Gift", + "GROUND": "Boden", + "ROCK": "Gestein", + "BUG": "Käfer", + "GHOST": "Geist", + "STEEL": "Stahl", + "FIRE": "Feuer", + "WATER": "Wasser", + "GRASS": "Pflanze", + "ELECTRIC": "Elektro", + "PSYCHIC": "Psycho", + "ICE": "Eis", + "DRAGON": "Drache", + "DARK": "Unlicht", + "FAIRY": "Fee", + "STELLAR": "Stellar", + }, +} as const; \ No newline at end of file diff --git a/src/locales/de/pokemon-stat.ts b/src/locales/de/pokemon-stat.ts deleted file mode 100644 index 531b5022b68..00000000000 --- a/src/locales/de/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "Max. KP", - "HPshortened": "MaxKP", - "ATK": "Angriff", - "ATKshortened": "Ang", - "DEF": "Verteidigung", - "DEFshortened": "Vert", - "SPATK": "Sp. Ang", - "SPATKshortened": "SpAng", - "SPDEF": "Sp. Vert", - "SPDEFshortened": "SpVert", - "SPD": "Initiative", - "SPDshortened": "Init" -} as const; \ No newline at end of file diff --git a/src/locales/de/splash-messages.ts b/src/locales/de/splash-messages.ts index 6815d7f1824..4bbe9a25492 100644 --- a/src/locales/de/splash-messages.ts +++ b/src/locales/de/splash-messages.ts @@ -1,37 +1,37 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const splashMessages: SimpleTranslationEntries = { - "battlesWon": "Battles Won!", - "joinTheDiscord": "Join the Discord!", - "infiniteLevels": "Infinite Levels!", - "everythingStacks": "Everything Stacks!", - "optionalSaveScumming": "Optional Save Scumming!", - "biomes": "35 Biomes!", + "battlesWon": "Kämpfe gewonnen!", + "joinTheDiscord": "Tritt dem Discord bei!", + "infiniteLevels": "Unendliche Level!", + "everythingStacks": "Alles stapelt sich!", + "optionalSaveScumming": "Optionales Save Scumming!", + "biomes": "35 Biome!", "openSource": "Open Source!", - "playWithSpeed": "Play with 5x Speed!", - "liveBugTesting": "Live Bug Testing!", - "heavyInfluence": "Heavy RoR2 Influence!", + "playWithSpeed": "Spiele mit fünffacher Geschwindigkeit!", + "liveBugTesting": "Live-Bug-Tests!", + "heavyInfluence": "Starker RoR2-Einfluss!", "pokemonRiskAndPokemonRain": "Pokémon Risk and Pokémon Rain!", - "nowWithMoreSalt": "Now with 33% More Salt!", - "infiniteFusionAtHome": "Infinite Fusion at Home!", - "brokenEggMoves": "Broken Egg Moves!", - "magnificent": "Magnificent!", - "mubstitute": "Mubstitute!", - "thatsCrazy": "That\'s Crazy!", - "oranceJuice": "Orance Juice!", - "questionableBalancing": "Questionable Balancing!", - "coolShaders": "Cool Shaders!", - "aiFree": "AI-Free!", - "suddenDifficultySpikes": "Sudden Difficulty Spikes!", - "basedOnAnUnfinishedFlashGame": "Based on an Unfinished Flash Game!", - "moreAddictiveThanIntended": "More Addictive than Intended!", - "mostlyConsistentSeeds": "Mostly Consistent Seeds!", - "achievementPointsDontDoAnything": "Achievement Points Don\'t Do Anything!", - "youDoNotStartAtLevel": "You Do Not Start at Level 2000!", - "dontTalkAboutTheManaphyEggIncident": "Don\'t Talk About the Manaphy Egg Incident!", - "alsoTryPokengine": "Also Try Pokéngine!", - "alsoTryEmeraldRogue": "Also Try Emerald Rogue!", - "alsoTryRadicalRed": "Also Try Radical Red!", - "eeveeExpo": "Eevee Expo!", - "ynoproject": "YNOproject!", + "nowWithMoreSalt": "Jetzt mit 33% mehr Salz!", + "infiniteFusionAtHome": "Wir haben Infinite Fusionen zu Hause!", + "brokenEggMoves": "Übermächtige Ei-Attacken!", + "magnificent": "Herrlich!", + "mubstitute": "Melegator!", + "thatsCrazy": "Das ist verrückt!", + "oranceJuice": "Orangensaft!", + "questionableBalancing": "Fragwürdiges Balancing!", + "coolShaders": "Coole Shader!", + "aiFree": "Ohne KI!", + "suddenDifficultySpikes": "Plötzliche Schwierigkeitsspitzen!", + "basedOnAnUnfinishedFlashGame": "Basierend auf einem unfertigen Flash-Spiel!", + "moreAddictiveThanIntended": "Süchtig machender als beabsichtigt!", + "mostlyConsistentSeeds": "Meistens konsistente Seeds!", + "achievementPointsDontDoAnything": "Erungenschaftspunkte tun nichts!", + "youDoNotStartAtLevel": "Du startest nicht auf Level 2000!", + "dontTalkAboutTheManaphyEggIncident": "Wir reden nicht über den Manaphy-Ei-Vorfall!", + "alsoTryPokengine": "Versuche auch Pokéngine!", + "alsoTryEmeraldRogue": "Versuche auch Emerald Rogue!", + "alsoTryRadicalRed": "Versuche auch Radical Red!", + "eeveeExpo": "Evoli-Expo!", + "ynoproject": "YNO-Projekt!", } as const; \ No newline at end of file diff --git a/src/locales/de/trainers.ts b/src/locales/de/trainers.ts index 99e352b89ea..11e8d914842 100644 --- a/src/locales/de/trainers.ts +++ b/src/locales/de/trainers.ts @@ -44,8 +44,8 @@ export const trainerClasses: SimpleTranslationEntries = { "depot_agent": "Bahnangestellter", "doctor": "Arzt", "doctor_female": "Ärztin", - "fishermen": "Angler", - "fishermen_female": "Angler", // Seems to be the same in german but exists in other languages like italian + "fisherman": "Angler", + "fisherman_female": "Angler", // Seems to be the same in german but exists in other languages like italian "gentleman": "Gentleman", "guitarist": "Gitarrist", "guitarist_female": "Gitarristin", @@ -61,15 +61,15 @@ export const trainerClasses: SimpleTranslationEntries = { "maid": "Zofe", "madame": "Madam", "medical_team": "Mediziner", - "musican": "Musiker", + "musician": "Musiker", "hex_maniac": "Hexe", "nurse": "Pflegerin", "nursery_aide": "Erzieherin", "officer": "Polizist", "parasol_lady": "Schirmdame", "pilot": "Pilot", - "poké_fan": "Pokéfan", - "poké_fan_family": "Pokéfan-Pärchen", + "pokefan": "Pokéfan", + "pokefan_family": "Pokéfan-Pärchen", "preschooler": "Vorschüler", "preschooler_female": "Vorschülerin", "preschoolers": "Vorschüler", @@ -80,8 +80,12 @@ export const trainerClasses: SimpleTranslationEntries = { "pokémon_rangers": "Pokémon-Ranger", "ranger": "Ranger", "restaurant_staff": "Restaurant Angestellte", + "rich": "Rich", + "rich_female": "Rich", "rich_boy": "Schnösel", "rich_couple": "Reiches Paar", + "rich_kid": "Rich Kid", + "rich_kid_female": "Rich Kid", "rich_kids": "Schnösel", "roughneck": "Raufbold", "scientist": "Forscher", @@ -107,8 +111,6 @@ export const trainerClasses: SimpleTranslationEntries = { "worker_female": "Arbeiterin", "workers": "Arbeiter", "youngster": "Knirps" - - } as const; // Names of special trainers like gym leaders, elite four, and the champion @@ -217,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = { "kahili": "Kahili", "rika": "Cay", "poppy": "Poppy", - "larry_elite": "Aoki", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "hassel": "Sinius", "crispin": "Matt", "amarys": "Erin", @@ -225,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = { "drayton": "Levy", "blue": "Blau", "red": "Rot", - "lance_champion": "Siegfried", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "steven": "Troy", "wallace": "Wassili", "cynthia": "Cynthia", diff --git a/src/locales/de/weather.ts b/src/locales/de/weather.ts index 0c5635de736..6e40714f88f 100644 --- a/src/locales/de/weather.ts +++ b/src/locales/de/weather.ts @@ -4,41 +4,41 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; * The weather namespace holds text displayed when weather is active during a battle */ export const weather: SimpleTranslationEntries = { - "sunnyStartMessage": "Die Sonne hellt auf!", - "sunnyLapseMessage": "Die Sonne blendet.", - "sunnyClearMessage": "Die Sonne schwächt ab.", + "sunnyStartMessage": "Die Sonnenlicht wird stärker!", + "sunnyLapseMessage": "Die Sonnenlicht ist stark.", + "sunnyClearMessage": "Die Sonnenlicht verliert wieder an Intensität.", "rainStartMessage": "Es fängt an zu regnen!", - "rainLapseMessage": "Es regnet weiterhin.", - "rainClearMessage": "Es hört auf zu regnen.", + "rainLapseMessage": "Es regnet weiter.", + "rainClearMessage": "Der Regen lässt nach.", - "sandstormStartMessage": "Ein Sandsturm braut sich zusammen!", + "sandstormStartMessage": "Ein Sandsturm kommt auf!", "sandstormLapseMessage": "Der Sandsturm tobt.", - "sandstormClearMessage": "Der Sandsturm lässt nach.", - "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} ist vom\nSandsturm beeinträchtigt!", + "sandstormClearMessage": "Der Sandsturm legt sich.", + "sandstormDamageMessage": " Der Sandsturm fügt {{pokemonPrefix}}{{pokemonName}} Schaden zu!", "hailStartMessage": "Es fängt an zu hageln!", - "hailLapseMessage": "Es hagelt weiterhin.", - "hailClearMessage": "Es hört auf zu hageln.", - "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} ist vom\nHagel beeinträchtigt!", + "hailLapseMessage": "Der Hagelsturm tobt.", + "hailClearMessage": "Der Hagelsturm legt sich.", + "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} wird von Hagelkörnern getroffen!", "snowStartMessage": "Es fängt an zu schneien!", - "snowLapseMessage": "Es schneit weiterhin.", - "snowClearMessage": "Es hört auf zu schneien.", + "snowLapseMessage": "Der Schneesturm tobt.", + "snowClearMessage": "Der Schneesturm legt sich.", - "fogStartMessage": "Es fängt an zu nebeln!", - "fogLapseMessage": "Es nebelt weiterhin.", - "fogClearMessage": "Es hört auf zu nebeln.", + "fogStartMessage": "Am Boden breitet sich dichter Nebel aus!", + "fogLapseMessage": "Der Nebel bleibt dicht.", + "fogClearMessage": "Der Nebel lichtet sich.", - "heavyRainStartMessage": "Ein Starkregen beginnt!", - "heavyRainLapseMessage": "Der Starkregen hält an.", - "heavyRainClearMessage": "Der Starkregen lässt nach.", + "heavyRainStartMessage": "Es fängt an, in Strömen zu regnen!", + "heavyRainLapseMessage": "Der strömende Regen hält an.", + "heavyRainClearMessage": "Der strömende Regen lässt nach.", - "harshSunStartMessage": "Das Sonnenlicht wird wärmer!", - "harshSunLapseMessage": "Das Sonnenlicht brennt.", - "harshSunClearMessage": "Das Sonnenlicht schwächt ab.", + "harshSunStartMessage": "Das Sonnenlicht wird sehr viel stärker!", + "harshSunLapseMessage": "Das Sonnenlicht ist sehr stark.", + "harshSunClearMessage": "Das Sonnenlicht verliert an Intensität.", - "strongWindsStartMessage": "Ein starker Wind zieht auf!", - "strongWindsLapseMessage": "Der starke Wind tobt.", - "strongWindsClearMessage": "Der starke Wind legt sich." + "strongWindsStartMessage": "Alle Flug-Pokémon werden von rätselhaften Luftströmungen geschützt!", + "strongWindsLapseMessage": "Die rätselhafte Luftströmung hält an.", + "strongWindsClearMessage": "Die rätselhafte Luftströmung hat sich wieder geleget.", } diff --git a/src/locales/en/battle-message-ui-handler.ts b/src/locales/en/battle-message-ui-handler.ts new file mode 100644 index 00000000000..346f856872c --- /dev/null +++ b/src/locales/en/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "Best", + "ivFantastic": "Fantastic", + "ivVeryGood": "Very Good", + "ivPrettyGood": "Pretty Good", + "ivDecent": "Decent", + "ivNoGood": "No Good", +} as const; \ No newline at end of file diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts index 0162f2922af..a6ed2fabc64 100644 --- a/src/locales/en/battle.ts +++ b/src/locales/en/battle.ts @@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} appeared.", "trainerAppeared": "{{trainerName}}\nwould like to battle!", + "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", "singleWildAppeared": "A wild {{pokemonName}} appeared!", "multiWildAppeared": "A wild {{pokemonName1}}\nand {{pokemonName2}} appeared!", "playerComeBack": "Come back, {{pokemonName}}!", diff --git a/src/locales/en/berry.ts b/src/locales/en/berry.ts new file mode 100644 index 00000000000..8c8bc5ee280 --- /dev/null +++ b/src/locales/en/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "Sitrus Berry", + effect: "Restores 25% HP if HP is below 50%", + }, + "LUM": { + name: "Lum Berry", + effect: "Cures any non-volatile status condition and confusion", + }, + "ENIGMA": { + name: "Enigma Berry", + effect: "Restores 25% HP if hit by a super effective move", + }, + "LIECHI": { + name: "Liechi Berry", + effect: "Raises Attack if HP is below 25%", + }, + "GANLON": { + name: "Ganlon Berry", + effect: "Raises Defense if HP is below 25%", + }, + "PETAYA": { + name: "Petaya Berry", + effect: "Raises Sp. Atk if HP is below 25%", + }, + "APICOT": { + name: "Apicot Berry", + effect: "Raises Sp. Def if HP is below 25%", + }, + "SALAC": { + name: "Salac Berry", + effect: "Raises Speed if HP is below 25%", + }, + "LANSAT": { + name: "Lansat Berry", + effect: "Raises critical hit ratio if HP is below 25%", + }, + "STARF": { + name: "Starf Berry", + effect: "Sharply raises a random stat if HP is below 25%", + }, + "LEPPA": { + name: "Leppa Berry", + effect: "Restores 10 PP to a move if its PP reaches 0", + }, +} as const; \ No newline at end of file diff --git a/src/locales/en/config.ts b/src/locales/en/config.ts index a5d207da932..984b0fa239f 100644 --- a/src/locales/en/config.ts +++ b/src/locales/en/config.ts @@ -12,13 +12,14 @@ import { move } from "./move"; import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; -import { titles,trainerClasses,trainerNames } from "./trainers"; -import { splashMessages } from "./splash-messages" import { weather } from "./weather"; - +import { battleMessageUiHandler } from "./battle-message-ui-handler"; +import { berry } from "./berry"; export const enConfig = { ability: ability, @@ -27,20 +28,22 @@ export const enConfig = { commandUiHandler: commandUiHandler, egg: egg, fightUiHandler: fightUiHandler, - menuUiHandler: menuUiHandler, + growth: growth, menu: menu, + menuUiHandler: menuUiHandler, + modifierType: modifierType, move: move, + nature: nature, pokeball: pokeball, - pokemonStat: pokemonStat, pokemon: pokemon, + pokemonInfo: pokemonInfo, + splashMessages: splashMessages, starterSelectUiHandler: starterSelectUiHandler, titles: titles, trainerClasses: trainerClasses, trainerNames: trainerNames, tutorial: tutorial, - splashMessages: splashMessages, - nature: nature, - growth: growth, weather: weather, - modifierType: modifierType, -} + battleMessageUiHandler: battleMessageUiHandler, + berry: berry, +} \ No newline at end of file diff --git a/src/locales/en/modifier-type.ts b/src/locales/en/modifier-type.ts index 043d7a705d5..31d4abbce29 100644 --- a/src/locales/en/modifier-type.ts +++ b/src/locales/en/modifier-type.ts @@ -384,26 +384,4 @@ export const modifierType: ModifierTypeTranslationEntries = { "CHILL_DRIVE": "Chill Drive", "DOUSE_DRIVE": "Douse Drive", }, - TeraType: { - "UNKNOWN": "Unknown", - "NORMAL": "Normal", - "FIGHTING": "Fighting", - "FLYING": "Flying", - "POISON": "Poison", - "GROUND": "Ground", - "ROCK": "Rock", - "BUG": "Bug", - "GHOST": "Ghost", - "STEEL": "Steel", - "FIRE": "Fire", - "WATER": "Water", - "GRASS": "Grass", - "ELECTRIC": "Electric", - "PSYCHIC": "Psychic", - "ICE": "Ice", - "DRAGON": "Dragon", - "DARK": "Dark", - "FAIRY": "Fairy", - "STELLAR": "Stellar", - }, } as const; \ No newline at end of file diff --git a/src/locales/en/pokemon-info.ts b/src/locales/en/pokemon-info.ts new file mode 100644 index 00000000000..2c7ee78f07a --- /dev/null +++ b/src/locales/en/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "Max. HP", + "HPshortened": "MaxHP", + "ATK": "Attack", + "ATKshortened": "Atk", + "DEF": "Defense", + "DEFshortened": "Def", + "SPATK": "Sp. Atk", + "SPATKshortened": "SpAtk", + "SPDEF": "Sp. Def", + "SPDEFshortened": "SpDef", + "SPD": "Speed", + "SPDshortened": "Spd" + }, + + Type: { + "UNKNOWN": "Unknown", + "NORMAL": "Normal", + "FIGHTING": "Fighting", + "FLYING": "Flying", + "POISON": "Poison", + "GROUND": "Ground", + "ROCK": "Rock", + "BUG": "Bug", + "GHOST": "Ghost", + "STEEL": "Steel", + "FIRE": "Fire", + "WATER": "Water", + "GRASS": "Grass", + "ELECTRIC": "Electric", + "PSYCHIC": "Psychic", + "ICE": "Ice", + "DRAGON": "Dragon", + "DARK": "Dark", + "FAIRY": "Fairy", + "STELLAR": "Stellar", + }, +} as const; \ No newline at end of file diff --git a/src/locales/en/pokemon-stat.ts b/src/locales/en/pokemon-stat.ts deleted file mode 100644 index 7a209461b11..00000000000 --- a/src/locales/en/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "Max. HP", - "HPshortened": "MaxHP", - "ATK": "Attack", - "ATKshortened": "Atk", - "DEF": "Defense", - "DEFshortened": "Def", - "SPATK": "Sp. Atk", - "SPATKshortened": "SpAtk", - "SPDEF": "Sp. Def", - "SPDEFshortened": "SpDef", - "SPD": "Speed", - "SPDshortened": "Spd" -} as const; \ No newline at end of file diff --git a/src/locales/en/trainers.ts b/src/locales/en/trainers.ts index c4acd85c44e..03c3e22c12c 100644 --- a/src/locales/en/trainers.ts +++ b/src/locales/en/trainers.ts @@ -44,8 +44,8 @@ export const trainerClasses: SimpleTranslationEntries = { "depot_agent": "Depot Agent", "doctor": "Doctor", "doctor_female": "Doctor", - "fishermen": "Fishermen", - "fishermen_female": "Fishermen", + "fisherman": "Fisherman", + "fisherman_female": "Fisherman", "gentleman": "Gentleman", "guitarist": "Guitarist", "guitarist_female": "Guitarist", @@ -61,15 +61,15 @@ export const trainerClasses: SimpleTranslationEntries = { "maid": "Maid", "madame": "Madame", "medical_team": "Medical Team", - "musican": "Musician", + "musician": "Musician", "hex_maniac": "Hex Maniac", "nurse": "Nurse", "nursery_aide": "Nursery Aide", "officer": "Officer", "parasol_lady": "Parasol Lady", "pilot": "Pilot", - "poké_fan": "Poké Fan", - "poké_fan_family": "Poké Fan Family", + "pokefan": "Poké Fan", + "pokefan_family": "Poké Fan Family", "preschooler": "Preschooler", "preschooler_female": "Preschooler", "preschoolers": "Preschoolers", @@ -80,8 +80,12 @@ export const trainerClasses: SimpleTranslationEntries = { "pokémon_rangers": "Pokémon Ranger", "ranger": "Ranger", "restaurant_staff": "Restaurant Staff", + "rich": "Rich", + "rich_female": "Rich", "rich_boy": "Rich Boy", "rich_couple": "Rich Couple", + "rich_kid": "Rich Kid", + "rich_kid_female": "Rich Kid", "rich_kids": "Rich Kids", "roughneck": "Roughneck", "scientist": "Scientist", @@ -105,6 +109,7 @@ export const trainerClasses: SimpleTranslationEntries = { "waitress": "Waitress", "worker": "Worker", "worker_female": "Worker", + "workers": "Workers", "youngster": "Youngster" } as const; @@ -214,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = { "kahili": "Kahili", "rika": "Rika", "poppy": "Poppy", - "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "hassel": "Hassel", "crispin": "Crispin", "amarys": "Amarys", @@ -222,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = { "drayton": "Drayton", "blue": "Blue", "red": "Red", - "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "steven": "Steven", "wallace": "Wallace", "cynthia": "Cynthia", diff --git a/src/locales/es/battle-message-ui-handler.ts b/src/locales/es/battle-message-ui-handler.ts new file mode 100644 index 00000000000..346f856872c --- /dev/null +++ b/src/locales/es/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "Best", + "ivFantastic": "Fantastic", + "ivVeryGood": "Very Good", + "ivPrettyGood": "Pretty Good", + "ivDecent": "Decent", + "ivNoGood": "No Good", +} as const; \ No newline at end of file diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts index 5b4b696a9d2..5715c58ece0 100644 --- a/src/locales/es/battle.ts +++ b/src/locales/es/battle.ts @@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "¡{{bossName}} te corta el paso!", "trainerAppeared": "¡{{trainerName}}\nte desafía!", + "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", "singleWildAppeared": "¡Un {{pokemonName}} salvaje te corta el paso!", "multiWildAppeared": "¡Un {{pokemonName1}} y un {{pokemonName2}} salvajes\nte cortan el paso!", "playerComeBack": "¡{{pokemonName}}, ven aquí!", diff --git a/src/locales/es/berry.ts b/src/locales/es/berry.ts new file mode 100644 index 00000000000..8c8bc5ee280 --- /dev/null +++ b/src/locales/es/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "Sitrus Berry", + effect: "Restores 25% HP if HP is below 50%", + }, + "LUM": { + name: "Lum Berry", + effect: "Cures any non-volatile status condition and confusion", + }, + "ENIGMA": { + name: "Enigma Berry", + effect: "Restores 25% HP if hit by a super effective move", + }, + "LIECHI": { + name: "Liechi Berry", + effect: "Raises Attack if HP is below 25%", + }, + "GANLON": { + name: "Ganlon Berry", + effect: "Raises Defense if HP is below 25%", + }, + "PETAYA": { + name: "Petaya Berry", + effect: "Raises Sp. Atk if HP is below 25%", + }, + "APICOT": { + name: "Apicot Berry", + effect: "Raises Sp. Def if HP is below 25%", + }, + "SALAC": { + name: "Salac Berry", + effect: "Raises Speed if HP is below 25%", + }, + "LANSAT": { + name: "Lansat Berry", + effect: "Raises critical hit ratio if HP is below 25%", + }, + "STARF": { + name: "Starf Berry", + effect: "Sharply raises a random stat if HP is below 25%", + }, + "LEPPA": { + name: "Leppa Berry", + effect: "Restores 10 PP to a move if its PP reaches 0", + }, +} as const; \ No newline at end of file diff --git a/src/locales/es/config.ts b/src/locales/es/config.ts index 6aac47563ee..92349028899 100644 --- a/src/locales/es/config.ts +++ b/src/locales/es/config.ts @@ -12,13 +12,14 @@ import { move } from "./move"; import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; -import { titles,trainerClasses,trainerNames } from "./trainers"; -import { splashMessages } from "./splash-messages" import { weather } from "./weather"; - +import { battleMessageUiHandler } from "./battle-message-ui-handler"; +import { berry } from "./berry"; export const esConfig = { ability: ability, @@ -27,20 +28,22 @@ export const esConfig = { commandUiHandler: commandUiHandler, egg: egg, fightUiHandler: fightUiHandler, - menuUiHandler: menuUiHandler, + growth: growth, menu: menu, + menuUiHandler: menuUiHandler, + modifierType: modifierType, move: move, + nature: nature, pokeball: pokeball, - pokemonStat: pokemonStat, pokemon: pokemon, + pokemonInfo: pokemonInfo, + splashMessages: splashMessages, starterSelectUiHandler: starterSelectUiHandler, titles: titles, trainerClasses: trainerClasses, trainerNames: trainerNames, tutorial: tutorial, - splashMessages: splashMessages, - nature: nature, - growth: growth, weather: weather, - modifierType: modifierType, -} + battleMessageUiHandler: battleMessageUiHandler, + berry: berry, +} \ No newline at end of file diff --git a/src/locales/es/modifier-type.ts b/src/locales/es/modifier-type.ts index 043d7a705d5..31d4abbce29 100644 --- a/src/locales/es/modifier-type.ts +++ b/src/locales/es/modifier-type.ts @@ -384,26 +384,4 @@ export const modifierType: ModifierTypeTranslationEntries = { "CHILL_DRIVE": "Chill Drive", "DOUSE_DRIVE": "Douse Drive", }, - TeraType: { - "UNKNOWN": "Unknown", - "NORMAL": "Normal", - "FIGHTING": "Fighting", - "FLYING": "Flying", - "POISON": "Poison", - "GROUND": "Ground", - "ROCK": "Rock", - "BUG": "Bug", - "GHOST": "Ghost", - "STEEL": "Steel", - "FIRE": "Fire", - "WATER": "Water", - "GRASS": "Grass", - "ELECTRIC": "Electric", - "PSYCHIC": "Psychic", - "ICE": "Ice", - "DRAGON": "Dragon", - "DARK": "Dark", - "FAIRY": "Fairy", - "STELLAR": "Stellar", - }, } as const; \ No newline at end of file diff --git a/src/locales/es/pokemon-info.ts b/src/locales/es/pokemon-info.ts new file mode 100644 index 00000000000..fabc7220f3c --- /dev/null +++ b/src/locales/es/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "PV", + "HPshortened": "PV", + "ATK": "Ataque", + "ATKshortened": "Ata", + "DEF": "Defensa", + "DEFshortened": "Def", + "SPATK": "At. Esp.", + "SPATKshortened": "AtEsp", + "SPDEF": "Def. Esp.", + "SPDEFshortened": "DefEsp", + "SPD": "Velocidad", + "SPDshortened": "Veloc." + }, + + Type: { + "UNKNOWN": "Unknown", + "NORMAL": "Normal", + "FIGHTING": "Fighting", + "FLYING": "Flying", + "POISON": "Poison", + "GROUND": "Ground", + "ROCK": "Rock", + "BUG": "Bug", + "GHOST": "Ghost", + "STEEL": "Steel", + "FIRE": "Fire", + "WATER": "Water", + "GRASS": "Grass", + "ELECTRIC": "Electric", + "PSYCHIC": "Psychic", + "ICE": "Ice", + "DRAGON": "Dragon", + "DARK": "Dark", + "FAIRY": "Fairy", + "STELLAR": "Stellar", + }, +} as const; \ No newline at end of file diff --git a/src/locales/es/pokemon-stat.ts b/src/locales/es/pokemon-stat.ts deleted file mode 100644 index 514ef19891b..00000000000 --- a/src/locales/es/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "PV", - "HPshortened": "PV", - "ATK": "Ataque", - "ATKshortened": "Ata", - "DEF": "Defensa", - "DEFshortened": "Def", - "SPATK": "At. Esp.", - "SPATKshortened": "AtEsp", - "SPDEF": "Def. Esp.", - "SPDEFshortened": "DefEsp", - "SPD": "Velocidad", - "SPDshortened": "Veloc." -} as const; \ No newline at end of file diff --git a/src/locales/es/trainers.ts b/src/locales/es/trainers.ts index c4acd85c44e..916ef8fb838 100644 --- a/src/locales/es/trainers.ts +++ b/src/locales/es/trainers.ts @@ -44,8 +44,8 @@ export const trainerClasses: SimpleTranslationEntries = { "depot_agent": "Depot Agent", "doctor": "Doctor", "doctor_female": "Doctor", - "fishermen": "Fishermen", - "fishermen_female": "Fishermen", + "fisherman": "Fisherman", + "fisherman_female": "Fisherman", "gentleman": "Gentleman", "guitarist": "Guitarist", "guitarist_female": "Guitarist", @@ -61,15 +61,15 @@ export const trainerClasses: SimpleTranslationEntries = { "maid": "Maid", "madame": "Madame", "medical_team": "Medical Team", - "musican": "Musician", + "musician": "Musician", "hex_maniac": "Hex Maniac", "nurse": "Nurse", "nursery_aide": "Nursery Aide", "officer": "Officer", "parasol_lady": "Parasol Lady", "pilot": "Pilot", - "poké_fan": "Poké Fan", - "poké_fan_family": "Poké Fan Family", + "pokefan": "Poké Fan", + "pokefan_family": "Poké Fan Family", "preschooler": "Preschooler", "preschooler_female": "Preschooler", "preschoolers": "Preschoolers", @@ -80,8 +80,12 @@ export const trainerClasses: SimpleTranslationEntries = { "pokémon_rangers": "Pokémon Ranger", "ranger": "Ranger", "restaurant_staff": "Restaurant Staff", + "rich": "Rich", + "rich_female": "Rich", "rich_boy": "Rich Boy", "rich_couple": "Rich Couple", + "rich_kid": "Rich Kid", + "rich_kid_female": "Rich Kid", "rich_kids": "Rich Kids", "roughneck": "Roughneck", "scientist": "Scientist", @@ -105,6 +109,7 @@ export const trainerClasses: SimpleTranslationEntries = { "waitress": "Waitress", "worker": "Worker", "worker_female": "Worker", + "workers": "Workers", "youngster": "Youngster" } as const; @@ -214,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = { "kahili": "Kahili", "rika": "Rika", "poppy": "Poppy", - "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "hassel": "Hassel", "crispin": "Crispin", "amarys": "Amarys", @@ -222,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = { "drayton": "Drayton", "blue": "Blue", "red": "Red", - "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "steven": "Steven", "wallace": "Wallace", "cynthia": "Cynthia", diff --git a/src/locales/fr/ability.ts b/src/locales/fr/ability.ts index 292467fcad6..49bfeb53acf 100644 --- a/src/locales/fr/ability.ts +++ b/src/locales/fr/ability.ts @@ -1109,7 +1109,7 @@ export const ability: AbilityTranslationEntries = { name: "Turbine Éolienne", description: "Si le Pokémon est touché par une capacité faisant appel au vent, il se charge en électricité.", }, - zerotoHero: { + zeroToHero: { name: "Supermutation", description: "Le Pokémon prend sa Forme Super en quittant le combat.", }, @@ -1129,23 +1129,23 @@ export const ability: AbilityTranslationEntries = { name: "Charge Quantique", description: "Quand un champ électrifié est actif ou que le Pokémon tient une capsule d’Énergie Booster, sa stat la plus élevée augmente.", }, - goodasGold: { + goodAsGold: { name: "Corps en Or", description: "Le corps en or pur et robuste du Pokémon l’immunise contre les capacités de statut des autres Pokémon.", }, - vesselofRuin: { + vesselOfRuin: { name: "Urne du Fléau", description: "Le pouvoir de l’urne qui appelle le fléau affaiblit l’Attaque Spéciale de tous les autres Pokémon.", }, - swordofRuin: { + swordOfRuin: { name: "Épée du Fléau", description: "Le pouvoir de l’épée qui appelle le fléau affaiblit la Défense de tous les autres Pokémon.", }, - tabletsofRuin: { + tabletsOfRuin: { name: "Bois du Fléau", description: "Le pouvoir du bois qui appelle le fléau affaiblit l’Attaque de tous les autres Pokémon.", }, - beadsofRuin: { + beadsOfRuin: { name: "Perles du Fléau", description: "Le pouvoir des perles qui appellent le fléau affaiblit la Défense Spéciale de tous les autres Pokémon.", }, diff --git a/src/locales/fr/battle-message-ui-handler.ts b/src/locales/fr/battle-message-ui-handler.ts new file mode 100644 index 00000000000..8dc980d49a4 --- /dev/null +++ b/src/locales/fr/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "Exceptionnel", + "ivFantastic": "Fantastique", + "ivVeryGood": "Très bon", + "ivPrettyGood": "Bon", + "ivDecent": "Passable…", + "ivNoGood": "Pas top…", +} as const; diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts index a76cc9cdeaf..827cea6b2d7 100644 --- a/src/locales/fr/battle.ts +++ b/src/locales/fr/battle.ts @@ -1,11 +1,12 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { - "bossAppeared": "Un {{bossName}} apparaît.", + "bossAppeared": "Un {{bossName}} apparait.", "trainerAppeared": "Un combat est lancé\npar {{trainerName}} !", - "singleWildAppeared": "Un {{pokemonName}} sauvage apparaît !", + "trainerAppearedDouble": "Un combat est lancé\npar {{trainerName}} !", + "singleWildAppeared": "Un {{pokemonName}} sauvage apparait !", "multiWildAppeared": "Un {{pokemonName1}} et un {{pokemonName2}}\nsauvages apparaissent !", - "playerComeBack": "{{pokemonName}}, on change !\nReviens !", + "playerComeBack": "{{pokemonName}} !\nReviens !", "trainerComeBack": "{{trainerName}} retire {{pokemonName}} !", "playerGo": "{{pokemonName}} ! Go !", "trainerGo": "{{pokemonName}} est envoyé par\n{{trainerName}} !", diff --git a/src/locales/fr/berry.ts b/src/locales/fr/berry.ts new file mode 100644 index 00000000000..dd6b387f4cc --- /dev/null +++ b/src/locales/fr/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "Baie Sitrus", + effect: "Restaure 25% des PV s’ils sont inférieurs à 50%", + }, + "LUM": { + name: "Baie Prine", + effect: "Soigne tout problème de statut permanant et la confusion", + }, + "ENIGMA": { + name: "Baie Enigma", + effect: "Restaure 25% des PV si touché par une capacité super efficace", + }, + "LIECHI": { + name: "Baie Lichii", + effect: "Augmente l’Attaque si les PV sont inférieurs à 25%", + }, + "GANLON": { + name: "Baie Lingan", + effect: "Augmente la Défense si les PV sont inférieurs à 25%", + }, + "PETAYA": { + name: "Baie Pitaye", + effect: "Augmente l’Atq. Spé. si les PV sont inférieurs à 25%", + }, + "APICOT": { + name: "Baie Abriko", + effect: "Augmente la Déf. Spé. si les PV sont inférieurs à 25%", + }, + "SALAC": { + name: "Baie Sailak", + effect: "Augmente la Vitesse si les PV sont inférieurs à 25%", + }, + "LANSAT": { + name: "Baie Lansat", + effect: "Augmente le taux de coups critiques si les PV sont inférieurs à 25%", + }, + "STARF": { + name: "Baie Frista", + effect: "Augmente énormément une statistique au hasard si les PV sont inférieurs à 25%", + }, + "LEPPA": { + name: "Baie Mepo", + effect: "Restaure 10 PP à une capacité dès que ses PP tombent à 0", + }, +} as const; diff --git a/src/locales/fr/config.ts b/src/locales/fr/config.ts index a2bb8430fba..ecec8de6cb0 100644 --- a/src/locales/fr/config.ts +++ b/src/locales/fr/config.ts @@ -12,14 +12,14 @@ import { move } from "./move"; import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; -import { titles,trainerClasses,trainerNames } from "./trainers"; -import { splashMessages } from "./splash-messages" import { weather } from "./weather"; - - +import { battleMessageUiHandler } from "./battle-message-ui-handler"; +import { berry } from "./berry"; export const frConfig = { ability: ability, @@ -28,21 +28,22 @@ export const frConfig = { commandUiHandler: commandUiHandler, egg: egg, fightUiHandler: fightUiHandler, - menuUiHandler: menuUiHandler, + growth: growth, menu: menu, + menuUiHandler: menuUiHandler, + modifierType: modifierType, move: move, + nature: nature, pokeball: pokeball, - pokemonStat: pokemonStat, pokemon: pokemon, + pokemonInfo: pokemonInfo, + splashMessages: splashMessages, starterSelectUiHandler: starterSelectUiHandler, titles: titles, trainerClasses: trainerClasses, trainerNames: trainerNames, tutorial: tutorial, - splashMessages: splashMessages, - nature: nature, - growth: growth, weather: weather, - modifierType: modifierType, -} - + battleMessageUiHandler: battleMessageUiHandler, + berry: berry, +} \ No newline at end of file diff --git a/src/locales/fr/modifier-type.ts b/src/locales/fr/modifier-type.ts index 043d7a705d5..f8697c04259 100644 --- a/src/locales/fr/modifier-type.ts +++ b/src/locales/fr/modifier-type.ts @@ -3,407 +3,385 @@ import { ModifierTypeTranslationEntries } from "#app/plugins/i18n"; export const modifierType: ModifierTypeTranslationEntries = { ModifierType: { "AddPokeballModifierType": { - name: "{{modifierCount}}x {{pokeballName}}", - description: "Receive {{pokeballName}} x{{modifierCount}} (Inventory: {{pokeballAmount}}) \nCatch Rate: {{catchRate}}", + name: "{{pokeballName}} x{{modifierCount}}", + description: "Recevez {{modifierCount}} {{pokeballName}}s (Inventaire : {{pokeballAmount}}) \nTaux de capture : {{catchRate}}", }, "AddVoucherModifierType": { - name: "{{modifierCount}}x {{voucherTypeName}}", - description: "Receive {{voucherTypeName}} x{{modifierCount}}", + name: "{{voucherTypeName}} x{{modifierCount}}", + description: "Recevez {{modifierCount}} {{voucherTypeName}}", }, "PokemonHeldItemModifierType": { extra: { - "inoperable": "{{pokemonName}} can't take\nthis item!", - "tooMany": "{{pokemonName}} has too many\nof this item!", + "inoperable": "{{pokemonName}} ne peut pas\nporter cet objet !", + "tooMany": "{{pokemonName}} possède trop\nd’exemplaires de cet objet !", } }, "PokemonHpRestoreModifierType": { - description: "Restores {{restorePoints}} HP or {{restorePercent}}% HP for one Pokémon, whichever is higher", + description: "Restaure {{restorePoints}} PV ou {{restorePercent}}% des PV totaux d’un Pokémon, en fonction duquel des deux est le plus élevé", extra: { - "fully": "Fully restores HP for one Pokémon", - "fullyWithStatus": "Fully restores HP for one Pokémon and heals any status ailment", + "fully": "Restaure tous les PV d’un Pokémon", + "fullyWithStatus": "Restaure tous les PV d’un Pokémon et soigne tous ses problèmes de statut", } }, "PokemonReviveModifierType": { - description: "Revives one Pokémon and restores {{restorePercent}}% HP", + description: "Réanime un Pokémon et restaure {{restorePercent}}% de ses PV", }, "PokemonStatusHealModifierType": { - description: "Heals any status ailment for one Pokémon", + description: "Soigne tous les problèmes de statut d’un Pokémon", }, "PokemonPpRestoreModifierType": { - description: "Restores {{restorePoints}} PP for one Pokémon move", + description: "Restaure {{restorePoints}} PP à une capacité d’un Pokémon", extra: { - "fully": "Restores all PP for one Pokémon move", + "fully": "Restaure tous les PP à une capacité d’un Pokémon", } }, "PokemonAllMovePpRestoreModifierType": { - description: "Restores {{restorePoints}} PP for all of one Pokémon's moves", + description: "Restaure {{restorePoints}} PP à toutes les capacités d’un Pokémon", extra: { - "fully": "Restores all PP for all of one Pokémon's moves", + "fully": "Restaure tous les PP à toutes les capacités d’un Pokémon", } }, "PokemonPpUpModifierType": { - description: "Permanently increases PP for one Pokémon move by {{upPoints}} for every 5 maximum PP (maximum 3)", + description: "Augmente le max de PP de {{upPoints}} à une capacité d’un Pokémon pour chaque 5 PP max (max : 3)", }, "PokemonNatureChangeModifierType": { - name: "{{natureName}} Mint", - description: "Changes a Pokémon's nature to {{natureName}} and permanently unlocks the nature for the starter.", + name: "Aromate {{natureName}}", + description: "Donne la nature {{natureName}} à un Pokémon et la débloque pour le starter lui étant lié.", }, "DoubleBattleChanceBoosterModifierType": { - description: "Doubles the chance of an encounter being a double battle for {{battleCount}} battles", + description: "Double les chances de tomber sur un combat double pendant {{battleCount}} combats", }, "TempBattleStatBoosterModifierType": { - description: "Increases the {{tempBattleStatName}} of all party members by 1 stage for 5 battles", + description: "Augmente d’1 cran {{tempBattleStatName}} pour toute l’équipe pendant 5 combats", }, "AttackTypeBoosterModifierType": { - description: "Increases the power of a Pokémon's {{moveType}}-type moves by 20%", + description: "Augmente de 20% la puissance des capacités de type {{moveType}} d’un Pokémon", }, "PokemonLevelIncrementModifierType": { - description: "Increases a Pokémon's level by 1", + description: "Fait monter un Pokémon d’1 niveau", }, "AllPokemonLevelIncrementModifierType": { - description: "Increases all party members' level by 1", + description: "Fait monter toute l’équipe d’1 niveau", }, "PokemonBaseStatBoosterModifierType": { - description: "Increases the holder's base {{statName}} by 10%. The higher your IVs, the higher the stack limit.", + description: "Augmente de 10% {{statName}} de base de son porteur. Plus les IV sont hauts, plus il peut en porter.", }, "AllPokemonFullHpRestoreModifierType": { - description: "Restores 100% HP for all Pokémon", + description: "Restaure tous les PV de toute l'équipe", }, "AllPokemonFullReviveModifierType": { - description: "Revives all fainted Pokémon, fully restoring HP", + description: "Réanime et restaure tous les PV de tous les Pokémon K.O.", }, "MoneyRewardModifierType": { - description: "Grants a {{moneyMultiplier}} amount of money (₽{{moneyAmount}})", + description: "Octroie une {{moneyMultiplier}} somme d’argent ({{moneyAmount}}₽)", extra: { - "small": "small", - "moderate": "moderate", - "large": "large", + "small": "petite", + "moderate": "moyenne", + "large": "grande", }, }, "ExpBoosterModifierType": { - description: "Increases gain of EXP. Points by {{boostPercent}}%", + description: "Augmente de {{boostPercent}}% le gain de Points d’Exp", }, "PokemonExpBoosterModifierType": { - description: "Increases the holder's gain of EXP. Points by {{boostPercent}}%", + description: "Augmente de {{boostPercent}}% le gain de Points d’Exp du porteur", }, "PokemonFriendshipBoosterModifierType": { - description: "Increases friendship gain per victory by 50%", + description: "Augmente le gain d’amitié de 50% par victoire", }, "PokemonMoveAccuracyBoosterModifierType": { - description: "Increases move accuracy by {{accuracyAmount}} (maximum 100)", + description: "Augmente de {{accuracyAmount}} la précision des capacités (maximum 100)", }, "PokemonMultiHitModifierType": { - description: "Attacks hit one additional time at the cost of a 60/75/82.5% power reduction per stack respectively", + description: "Frappe une fois de plus en échange d’une baisse de puissance de respectivement 60/75/82,5% par cumul", }, "TmModifierType": { - name: "TM{{moveId}} - {{moveName}}", - description: "Teach {{moveName}} to a Pokémon", + name: "CT{{moveId}} - {{moveName}}", + description: "Apprend la capacité {{moveName}} à un Pokémon", }, "EvolutionItemModifierType": { - description: "Causes certain Pokémon to evolve", + description: "Permet à certains Pokémon d’évoluer", }, "FormChangeItemModifierType": { - description: "Causes certain Pokémon to change form", + description: "Permet à certains Pokémon de changer de forme", }, "FusePokemonModifierType": { - description: "Combines two Pokémon (transfers Ability, splits base stats and types, shares move pool)", + description: "Fusionne deux Pokémon (transfère le Talent, sépare les stats de base et les types, partage le movepool)", }, "TerastallizeModifierType": { - name: "{{teraType}} Tera Shard", - description: "{{teraType}} Terastallizes the holder for up to 10 battles", + name: "Téra-Éclat {{teraType}}", + description: "{{teraType}} Téracristallise son porteur pendant 10 combats", }, "ContactHeldItemTransferChanceModifierType": { - description: "Upon attacking, there is a {{chancePercent}}% chance the foe's held item will be stolen", + description: "{{chancePercent}}% de chances de voler un objet de l’adversaire en l’attaquant", }, "TurnHeldItemTransferModifierType": { - description: "Every turn, the holder acquires one held item from the foe", + description: "À chaque tour, son porteur obtient un objet de son adversaire", }, "EnemyAttackStatusEffectChanceModifierType": { - description: "Adds a {{chancePercent}}% chance to inflict {{statusEffect}} with attack moves", + description: "Ajoute {{chancePercent}}% de chances d’infliger le statut {{statusEffect}} avec des capacités offensives", }, "EnemyEndureChanceModifierType": { - description: "Adds a {{chancePercent}}% chance of enduring a hit", + description: "Ajoute {{chancePercent}}% de chances d’encaisser un coup", }, - "RARE_CANDY": { name: "Rare Candy" }, - "RARER_CANDY": { name: "Rarer Candy" }, + "RARE_CANDY": { name: "Super Bonbon" }, + "RARER_CANDY": { name: "Hyper Bonbon" }, - "MEGA_BRACELET": { name: "Mega Bracelet", description: "Mega Stones become available" }, - "DYNAMAX_BAND": { name: "Dynamax Band", description: "Max Mushrooms become available" }, - "TERA_ORB": { name: "Tera Orb", description: "Tera Shards become available" }, + "MEGA_BRACELET": { name: "Méga-Bracelet", description: "Débloque les Méga-Gemmes" }, + "DYNAMAX_BAND": { name: "Poignet Dynamax", description: "Débloque le Dynamax" }, + "TERA_ORB": { name: "Orbe Téracristal", description: "Débloque les Téra-Éclats" }, - "MAP": { name: "Map", description: "Allows you to choose your destination at a crossroads" }, + "MAP": { name: "Carte", description: "Vous permet de choisir votre destination à un croisement" }, "POTION": { name: "Potion" }, "SUPER_POTION": { name: "Super Potion" }, "HYPER_POTION": { name: "Hyper Potion" }, - "MAX_POTION": { name: "Max Potion" }, - "FULL_RESTORE": { name: "Full Restore" }, + "MAX_POTION": { name: "Potion Max" }, + "FULL_RESTORE": { name: "Guérison" }, - "REVIVE": { name: "Revive" }, - "MAX_REVIVE": { name: "Max Revive" }, + "REVIVE": { name: "Rappel" }, + "MAX_REVIVE": { name: "Rappel Max" }, - "FULL_HEAL": { name: "Full Heal" }, + "FULL_HEAL": { name: "Total Soin" }, - "SACRED_ASH": { name: "Sacred Ash" }, + "SACRED_ASH": { name: "Cendres Sacrées" }, - "REVIVER_SEED": { name: "Reviver Seed", description: "Revives the holder for 1/2 HP upon fainting" }, + "REVIVER_SEED": { name: "Résugraine", description: "Réanime et restaure la moitié des PV de son porteur s’il tombe K.O." }, - "ETHER": { name: "Ether" }, - "MAX_ETHER": { name: "Max Ether" }, + "ETHER": { name: "Huile" }, + "MAX_ETHER": { name: "Huile Max" }, - "ELIXIR": { name: "Elixir" }, - "MAX_ELIXIR": { name: "Max Elixir" }, + "ELIXIR": { name: "Élixir" }, + "MAX_ELIXIR": { name: "Élixir Max" }, - "PP_UP": { name: "PP Up" }, + "PP_UP": { name: "PP Plus" }, "PP_MAX": { name: "PP Max" }, - "LURE": { name: "Lure" }, - "SUPER_LURE": { name: "Super Lure" }, - "MAX_LURE": { name: "Max Lure" }, + "LURE": { name: "Parfum" }, + "SUPER_LURE": { name: "Super Parfum" }, + "MAX_LURE": { name: "Parfum Max" }, - "MEMORY_MUSHROOM": { name: "Memory Mushroom", description: "Recall one Pokémon's forgotten move" }, + "MEMORY_MUSHROOM": { name: "Champi Mémoriel", description: "Remémore une capacité à un Pokémon" }, - "EXP_SHARE": { name: "EXP. All", description: "Non-participants receive 20% of a single participant's EXP. Points" }, - "EXP_BALANCE": { name: "EXP. Balance", description: "Weighs EXP. Points received from battles towards lower-leveled party members" }, + "EXP_SHARE": { name: "Multi Exp", description: "Tous les non-participants reçoivent 20% des Points d’Exp d’un participant" }, + "EXP_BALANCE": { name: "Équilibr’Exp", description: "Équilibre les Points d’Exp à l’avantage des membres de l’équipe aux plus bas niveaux" }, - "OVAL_CHARM": { name: "Oval Charm", description: "When multiple Pokémon participate in a battle, each gets an extra 10% of the total EXP" }, + "OVAL_CHARM": { name: "Charme Ovale", description: "Quand plusieurs Pokémon sont en combat, chacun gagne 10% supplémentaires du total d’Exp" }, - "EXP_CHARM": { name: "EXP. Charm" }, - "SUPER_EXP_CHARM": { name: "Super EXP. Charm" }, - "GOLDEN_EXP_CHARM": { name: "Golden EXP. Charm" }, + "EXP_CHARM": { name: "Charme Exp" }, + "SUPER_EXP_CHARM": { name: "Super Charme Exp" }, + "GOLDEN_EXP_CHARM": { name: "Charme Exp Doré" }, - "LUCKY_EGG": { name: "Lucky Egg" }, - "GOLDEN_EGG": { name: "Golden Egg" }, + "LUCKY_EGG": { name: "Œuf Chance" }, + "GOLDEN_EGG": { name: "Œuf d’Or" }, - "SOOTHE_BELL": { name: "Soothe Bell" }, + "SOOTHE_BELL": { name: "Grelot Zen" }, - "SOUL_DEW": { name: "Soul Dew", description: "Increases the influence of a Pokémon's nature on its stats by 10% (additive)" }, + "SOUL_DEW": { name: "Rosée Âme", description: "Augmente de 10% l’influence de la nature d’un Pokémon sur ses statistiques (cumulatif)" }, - "NUGGET": { name: "Nugget" }, - "BIG_NUGGET": { name: "Big Nugget" }, - "RELIC_GOLD": { name: "Relic Gold" }, + "NUGGET": { name: "Pépite" }, + "BIG_NUGGET": { name: "Maxi Pépite" }, + "RELIC_GOLD": { name: "Vieux Ducat" }, - "AMULET_COIN": { name: "Amulet Coin", description: "Increases money rewards by 20%" }, - "GOLDEN_PUNCH": { name: "Golden Punch", description: "Grants 50% of damage inflicted as money" }, - "COIN_CASE": { name: "Coin Case", description: "After every 10th battle, receive 10% of your money in interest" }, + "AMULET_COIN": { name: "Pièce Rune", description: "Augmente de 20% les gains d’argent" }, + "GOLDEN_PUNCH": { name: "Poing Doré", description: "50% des dégâts infligés sont convertis en argent" }, + "COIN_CASE": { name: "Boite Jetons", description: "Tous les 10 combats, recevez 10% de votre argent en intérêts" }, - "LOCK_CAPSULE": { name: "Lock Capsule", description: "Allows you to lock item rarities when rerolling items" }, + "LOCK_CAPSULE": { name: "Poké Écrin", description: "Permet de verrouiller des objets rares si vous relancez les objets proposés" }, - "GRIP_CLAW": { name: "Grip Claw" }, - "WIDE_LENS": { name: "Wide Lens" }, + "GRIP_CLAW": { name: "Accro Griffe" }, + "WIDE_LENS": { name: "Loupe" }, - "MULTI_LENS": { name: "Multi Lens" }, + "MULTI_LENS": { name: "Multi Loupe" }, - "HEALING_CHARM": { name: "Healing Charm", description: "Increases the effectiveness of HP restoring moves and items by 10% (excludes Revives)" }, - "CANDY_JAR": { name: "Candy Jar", description: "Increases the number of levels added by Rare Candy items by 1" }, + "HEALING_CHARM": { name: "Charme Soin", description: "Augmente de 10% l’efficacité des capacités et objets de soin de PV (hors Rappels)" }, + "CANDY_JAR": { name: "Jarre de Bonbons", description: "Augmente de 1 le nombre de niveaux gagnés à l’utilisation d’un Super Bonbon" }, - "BERRY_POUCH": { name: "Berry Pouch", description: "Adds a 25% chance that a used berry will not be consumed" }, + "BERRY_POUCH": { name: "Sac à Baies", description: "Ajoute 25% de chances qu’une Baie utilisée ne soit pas consommée" }, - "FOCUS_BAND": { name: "Focus Band", description: "Adds a 10% chance to survive with 1 HP after being damaged enough to faint" }, + "FOCUS_BAND": { name: "Bandeau", description: "Ajoute 10% de chances de survivre avec 1 PV si les dégâts reçus pouvaient mettre K.O." }, - "QUICK_CLAW": { name: "Quick Claw", description: "Adds a 10% chance to move first regardless of speed (after priority)" }, + "QUICK_CLAW": { name: "Vive Griffe", description: "Ajoute 10% de chances d’agir en premier, indépendamment de la vitesse (après la priorité)" }, - "KINGS_ROCK": { name: "King's Rock", description: "Adds a 10% chance an attack move will cause the opponent to flinch" }, + "KINGS_ROCK": { name: "Roche Royale", description: "Ajoute 10% de chances qu’une capacité offensive apeure l’adversaire" }, - "LEFTOVERS": { name: "Leftovers", description: "Heals 1/16 of a Pokémon's maximum HP every turn" }, - "SHELL_BELL": { name: "Shell Bell", description: "Heals 1/8 of a Pokémon's dealt damage" }, + "LEFTOVERS": { name: "Restes", description: "Soigne à chaque tour 1/16 des PV max d’un Pokémon" }, + "SHELL_BELL": { name: "Grelot Coque", description: "Soigne 1/8 des dégâts infligés par un Pokémon" }, - "BATON": { name: "Baton", description: "Allows passing along effects when switching Pokémon, which also bypasses traps" }, + "BATON": { name: "Bâton", description: "Permet de transmettre les effets en cas de changement de Pokémon. Ignore les pièges." }, - "SHINY_CHARM": { name: "Shiny Charm", description: "Dramatically increases the chance of a wild Pokémon being Shiny" }, - "ABILITY_CHARM": { name: "Ability Charm", description: "Dramatically increases the chance of a wild Pokémon having a Hidden Ability" }, + "SHINY_CHARM": { name: "Charme Chroma", description: "Augmente énormément les chances de rencontrer un Pokémon sauvage chromatique" }, + "ABILITY_CHARM": { name: "Charme Talent", description: "Augmente énormément les chances de rencontrer un Pokémon sauvage avec un Talent Caché" }, - "IV_SCANNER": { name: "IV Scanner", description: "Allows scanning the IVs of wild Pokémon. 2 IVs are revealed per stack. The best IVs are shown first" }, + "IV_SCANNER": { name: "Scanner d’IV", description: "Scanne les IV d’un Pokémon sauvage. 2 IV sont révélés par Scanner. Les meilleurs sont montrés en 1er." }, - "DNA_SPLICERS": { name: "DNA Splicers" }, + "DNA_SPLICERS": { name: "Pointeau ADN" }, - "MINI_BLACK_HOLE": { name: "Mini Black Hole" }, + "MINI_BLACK_HOLE": { name: "Mini Trou Noir" }, - "GOLDEN_POKEBALL": { name: "Golden Poké Ball", description: "Adds 1 extra item option at the end of every battle" }, + "GOLDEN_POKEBALL": { name: "Poké Ball Dorée", description: "Ajoute 1 choix d’objet à la fin de chaque combat" }, - "ENEMY_DAMAGE_BOOSTER": { name: "Damage Token", description: "Increases damage by 5%" }, - "ENEMY_DAMAGE_REDUCTION": { name: "Protection Token", description: "Reduces incoming damage by 2.5%" }, - "ENEMY_HEAL": { name: "Recovery Token", description: "Heals 2% of max HP every turn" }, - "ENEMY_ATTACK_POISON_CHANCE": { name: "Poison Token" }, - "ENEMY_ATTACK_PARALYZE_CHANCE": { name: "Paralyze Token" }, - "ENEMY_ATTACK_SLEEP_CHANCE": { name: "Sleep Token" }, - "ENEMY_ATTACK_FREEZE_CHANCE": { name: "Freeze Token" }, - "ENEMY_ATTACK_BURN_CHANCE": { name: "Burn Token" }, - "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { name: "Full Heal Token", description: "Adds a 10% chance every turn to heal a status condition" }, - "ENEMY_ENDURE_CHANCE": { name: "Endure Token" }, - "ENEMY_FUSED_CHANCE": { name: "Fusion Token", description: "Adds a 1% chance that a wild Pokémon will be a fusion" }, + "ENEMY_DAMAGE_BOOSTER": { name: "Jeton Dégâts", description: "Augmente les dégâts de 5%" }, + "ENEMY_DAMAGE_REDUCTION": { name: "Jeton Protection", description: "Diminue les dégâts reçus de 2,5%" }, + "ENEMY_HEAL": { name: "Jeton Soin", description: "Soigne 2% des PV max à chaque tour" }, + "ENEMY_ATTACK_POISON_CHANCE": { name: "Jeton Poison" }, + "ENEMY_ATTACK_PARALYZE_CHANCE": { name: "Jeton Paralysie" }, + "ENEMY_ATTACK_SLEEP_CHANCE": { name: "Jeton Sommeil" }, + "ENEMY_ATTACK_FREEZE_CHANCE": { name: "Jeton Gel" }, + "ENEMY_ATTACK_BURN_CHANCE": { name: "Jeton Brulure" }, + "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { name: "Jeton Total Soin", description: "Ajoute 10% de chances à chaque tour de se soigner d’un problème de statut." }, + "ENEMY_ENDURE_CHANCE": { name: "Jeton Ténacité" }, + "ENEMY_FUSED_CHANCE": { name: "Jeton Fusion", description: "Ajoute 1% de chances qu’un Pokémon sauvage soit une fusion." }, }, TempBattleStatBoosterItem: { - "x_attack": "X Attack", - "x_defense": "X Defense", - "x_sp_atk": "X Sp. Atk", - "x_sp_def": "X Sp. Def", - "x_speed": "X Speed", - "x_accuracy": "X Accuracy", - "dire_hit": "Dire Hit", + "x_attack": "Attaque +", + "x_defense": "Défense +", + "x_sp_atk": "Atq. Spé. +", + "x_sp_def": "Déf. Spé. +", + "x_speed": "Vitesse +", + "x_accuracy": "Précision +", + "dire_hit": "Muscle +", }, AttackTypeBoosterItem: { - "silk_scarf": "Silk Scarf", - "black_belt": "Black Belt", - "sharp_beak": "Sharp Beak", - "poison_barb": "Poison Barb", - "soft_sand": "Soft Sand", - "hard_stone": "Hard Stone", - "silver_powder": "Silver Powder", - "spell_tag": "Spell Tag", - "metal_coat": "Metal Coat", - "charcoal": "Charcoal", - "mystic_water": "Mystic Water", - "miracle_seed": "Miracle Seed", - "magnet": "Magnet", - "twisted_spoon": "Twisted Spoon", - "never_melt_ice": "Never-Melt Ice", - "dragon_fang": "Dragon Fang", - "black_glasses": "Black Glasses", - "fairy_feather": "Fairy Feather", + "silk_scarf": "Mouchoir Soie", + "black_belt": "Ceinture Noire", + "sharp_beak": "Bec Pointu", + "poison_barb": "Pic Venin", + "soft_sand": "Sable Doux", + "hard_stone": "Pierre Dure", + "silver_powder": "Poudre Argentée", + "spell_tag": "Rune Sort", + "metal_coat": "Peau Métal", + "charcoal": "Charbon", + "mystic_water": "Eau Mystique", + "miracle_seed": "Graine Miracle", + "magnet": "Aimant", + "twisted_spoon": "Cuillère Tordue", + "never_melt_ice": "Glace Éternelle", + "dragon_fang": "Croc Dragon", + "black_glasses": "Lunettes Noires", + "fairy_feather": "Plume Enchantée", }, BaseStatBoosterItem: { - "hp_up": "HP Up", - "protein": "Protein", - "iron": "Iron", + "hp_up": "PV Plus", + "protein": "Protéine", + "iron": "Fer", "calcium": "Calcium", "zinc": "Zinc", - "carbos": "Carbos", + "carbos": "Carbone", }, EvolutionItem: { - "NONE": "None", + "NONE": "Aucun", - "LINKING_CORD": "Linking Cord", - "SUN_STONE": "Sun Stone", - "MOON_STONE": "Moon Stone", - "LEAF_STONE": "Leaf Stone", - "FIRE_STONE": "Fire Stone", - "WATER_STONE": "Water Stone", - "THUNDER_STONE": "Thunder Stone", - "ICE_STONE": "Ice Stone", - "DUSK_STONE": "Dusk Stone", - "DAWN_STONE": "Dawn Stone", - "SHINY_STONE": "Shiny Stone", - "CRACKED_POT": "Cracked Pot", - "SWEET_APPLE": "Sweet Apple", - "TART_APPLE": "Tart Apple", - "STRAWBERRY_SWEET": "Strawberry Sweet", - "UNREMARKABLE_TEACUP": "Unremarkable Teacup", + "LINKING_CORD": "Fil de Liaison", + "SUN_STONE": "Pierre Soleil", + "MOON_STONE": "Pierre Lune", + "LEAF_STONE": "Pierre Plante", + "FIRE_STONE": "Pierre Feu", + "WATER_STONE": "Pierre Eau", + "THUNDER_STONE": "Pierre Foudre", + "ICE_STONE": "Pierre Glace", + "DUSK_STONE": "Pierre Nuit", + "DAWN_STONE": "Pierre Aube", + "SHINY_STONE": "Pierre Éclat", + "CRACKED_POT": "Théière Fêlée", + "SWEET_APPLE": "Pomme Sucrée", + "TART_APPLE": "Pomme Acidulée", + "STRAWBERRY_SWEET": "Fraise en Sucre", + "UNREMARKABLE_TEACUP": "Bol Médiocre", - "CHIPPED_POT": "Chipped Pot", - "BLACK_AUGURITE": "Black Augurite", - "GALARICA_CUFF": "Galarica Cuff", - "GALARICA_WREATH": "Galarica Wreath", - "PEAT_BLOCK": "Peat Block", - "AUSPICIOUS_ARMOR": "Auspicious Armor", - "MALICIOUS_ARMOR": "Malicious Armor", - "MASTERPIECE_TEACUP": "Masterpiece Teacup", - "METAL_ALLOY": "Metal Alloy", - "SCROLL_OF_DARKNESS": "Scroll Of Darkness", - "SCROLL_OF_WATERS": "Scroll Of Waters", - "SYRUPY_APPLE": "Syrupy Apple", + "CHIPPED_POT": "Théière Ébréchée", + "BLACK_AUGURITE": "Obsidienne", + "GALARICA_CUFF": "Bracelet Galanoa", + "GALARICA_WREATH": "Couronne Galanoa", + "PEAT_BLOCK": "Bloc de Tourbe", + "AUSPICIOUS_ARMOR": "Armure de la Fortune", + "MALICIOUS_ARMOR": "Armure de la Rancune", + "MASTERPIECE_TEACUP": "Bol Exceptionnel", + "METAL_ALLOY": "Métal Composite", + "SCROLL_OF_DARKNESS": "Rouleau des Ténèbres", + "SCROLL_OF_WATERS": "Rouleau de l’Eau", + "SYRUPY_APPLE": "Pomme Nectar", }, FormChangeItem: { - "NONE": "None", + "NONE": "Aucun", - "ABOMASITE": "Abomasite", + "ABOMASITE": "Blizzarite", "ABSOLITE": "Absolite", - "AERODACTYLITE": "Aerodactylite", - "AGGRONITE": "Aggronite", - "ALAKAZITE": "Alakazite", - "ALTARIANITE": "Altarianite", - "AMPHAROSITE": "Ampharosite", - "AUDINITE": "Audinite", - "BANETTITE": "Banettite", - "BEEDRILLITE": "Beedrillite", - "BLASTOISINITE": "Blastoisinite", - "BLAZIKENITE": "Blazikenite", - "CAMERUPTITE": "Cameruptite", - "CHARIZARDITE_X": "Charizardite X", - "CHARIZARDITE_Y": "Charizardite Y", + "AERODACTYLITE": "Ptéraïte", + "AGGRONITE": "Galekingite", + "ALAKAZITE": "Alakazamite", + "ALTARIANITE": "Altarite", + "AMPHAROSITE": "Pharampite", + "AUDINITE": "Nanméouïte", + "BANETTITE": "Branettite", + "BEEDRILLITE": "Dardargnite", + "BLASTOISINITE": "Tortankite", + "BLAZIKENITE": "Braségalite", + "CAMERUPTITE": "Caméruptite", + "CHARIZARDITE_X": "Dracaufite X", + "CHARIZARDITE_Y": "Dracaufite Y", "DIANCITE": "Diancite", - "GALLADITE": "Galladite", - "GARCHOMPITE": "Garchompite", + "GALLADITE": "Gallamite", + "GARCHOMPITE": "Carchacrokite", "GARDEVOIRITE": "Gardevoirite", - "GENGARITE": "Gengarite", - "GLALITITE": "Glalitite", - "GYARADOSITE": "Gyaradosite", - "HERACRONITE": "Heracronite", - "HOUNDOOMINITE": "Houndoominite", - "KANGASKHANITE": "Kangaskhanite", + "GENGARITE": "Ectoplasmite", + "GLALITITE": "Oniglalite", + "GYARADOSITE": "Léviatorite", + "HERACRONITE": "Scarhinoïte", + "HOUNDOOMINITE": "Démolossite", + "KANGASKHANITE": "Kangourexite", "LATIASITE": "Latiasite", "LATIOSITE": "Latiosite", - "LOPUNNITE": "Lopunnite", - "LUCARIONITE": "Lucarionite", - "MANECTITE": "Manectite", - "MAWILITE": "Mawilite", - "MEDICHAMITE": "Medichamite", - "METAGROSSITE": "Metagrossite", - "MEWTWONITE_X": "Mewtwonite X", - "MEWTWONITE_Y": "Mewtwonite Y", - "PIDGEOTITE": "Pidgeotite", - "PINSIRITE": "Pinsirite", + "LOPUNNITE": "Lockpinite", + "LUCARIONITE": "Lucarite", + "MANECTITE": "Élecsprintite", + "MAWILITE": "Mysdibulite", + "MEDICHAMITE": "Charminite", + "METAGROSSITE": "Métalossite", + "MEWTWONITE_X": "Mewtwoïte X", + "MEWTWONITE_Y": "Mewtwoïte Y", + "PIDGEOTITE": "Roucarnagite", + "PINSIRITE": "Scarabruite", "RAYQUAZITE": "Rayquazite", - "SABLENITE": "Sablenite", - "SALAMENCITE": "Salamencite", - "SCEPTILITE": "Sceptilite", - "SCIZORITE": "Scizorite", - "SHARPEDONITE": "Sharpedonite", - "SLOWBRONITE": "Slowbronite", + "SABLENITE": "Ténéfixite", + "SALAMENCITE": "Drattakite", + "SCEPTILITE": "Jungkite", + "SCIZORITE": "Cizayoxite", + "SHARPEDONITE": "Sharpedite", + "SLOWBRONITE": "Flagadossite", "STEELIXITE": "Steelixite", - "SWAMPERTITE": "Swampertite", - "TYRANITARITE": "Tyranitarite", - "VENUSAURITE": "Venusaurite", + "SWAMPERTITE": "Laggronite", + "TYRANITARITE": "Tyranocivite", + "VENUSAURITE": "Florizarrite", - "BLUE_ORB": "Blue Orb", - "RED_ORB": "Red Orb", - "SHARP_METEORITE": "Sharp Meteorite", - "HARD_METEORITE": "Hard Meteorite", - "SMOOTH_METEORITE": "Smooth Meteorite", - "ADAMANT_CRYSTAL": "Adamant Crystal", - "LUSTROUS_ORB": "Lustrous Orb", - "GRISEOUS_CORE": "Griseous Core", - "REVEAL_GLASS": "Reveal Glass", - "GRACIDEA": "Gracidea", - "MAX_MUSHROOMS": "Max Mushrooms", - "DARK_STONE": "Dark Stone", - "LIGHT_STONE": "Light Stone", - "PRISON_BOTTLE": "Prison Bottle", - "N_LUNARIZER": "N Lunarizer", - "N_SOLARIZER": "N Solarizer", - "RUSTED_SWORD": "Rusted Sword", - "RUSTED_SHIELD": "Rusted Shield", - "ICY_REINS_OF_UNITY": "Icy Reins Of Unity", - "SHADOW_REINS_OF_UNITY": "Shadow Reins Of Unity", - "WELLSPRING_MASK": "Wellspring Mask", - "HEARTHFLAME_MASK": "Hearthflame Mask", - "CORNERSTONE_MASK": "Cornerstone Mask", - "SHOCK_DRIVE": "Shock Drive", - "BURN_DRIVE": "Burn Drive", - "CHILL_DRIVE": "Chill Drive", - "DOUSE_DRIVE": "Douse Drive", + "BLUE_ORB": "Gemme Bleue", + "RED_ORB": "Gemme Rouge", + "SHARP_METEORITE": "Méteorite Aiguisée", + "HARD_METEORITE": "Méteorite Solide", + "SMOOTH_METEORITE": "Méteorite Lisse", + "ADAMANT_CRYSTAL": "Globe Adamant", + "LUSTROUS_ORB": "Orbe Perlé", + "GRISEOUS_CORE": "Globe Platiné", + "REVEAL_GLASS": "Miroir Sacré", + "GRACIDEA": "Gracidée", + "MAX_MUSHROOMS": "Maxi Champis", + "DARK_STONE": "Galet Noir", + "LIGHT_STONE": "Galet Blanc", + "PRISON_BOTTLE": "Vase Scellé", + "N_LUNARIZER": "Necroluna", + "N_SOLARIZER": "Necrosol", + "RUSTED_SWORD": "Épée Rouillée", + "RUSTED_SHIELD": "Bouclier Rouillé", + "ICY_REINS_OF_UNITY": "Rênes de l’Unité du Froid", + "SHADOW_REINS_OF_UNITY": "Rênes de l’Unité d’Effroi", + "WELLSPRING_MASK": "Masque du Puits", + "HEARTHFLAME_MASK": "Masque du Fourneau", + "CORNERSTONE_MASK": "Masque de la Pierre", + "SHOCK_DRIVE": "Module Choc", + "BURN_DRIVE": "Module Pyro", + "CHILL_DRIVE": "Module Aqua", + "DOUSE_DRIVE": "Module Choc", }, - TeraType: { - "UNKNOWN": "Unknown", - "NORMAL": "Normal", - "FIGHTING": "Fighting", - "FLYING": "Flying", - "POISON": "Poison", - "GROUND": "Ground", - "ROCK": "Rock", - "BUG": "Bug", - "GHOST": "Ghost", - "STEEL": "Steel", - "FIRE": "Fire", - "WATER": "Water", - "GRASS": "Grass", - "ELECTRIC": "Electric", - "PSYCHIC": "Psychic", - "ICE": "Ice", - "DRAGON": "Dragon", - "DARK": "Dark", - "FAIRY": "Fairy", - "STELLAR": "Stellar", - }, -} as const; \ No newline at end of file +} as const; diff --git a/src/locales/fr/move.ts b/src/locales/fr/move.ts index e4d7f5e03fa..3a0ce42c44d 100644 --- a/src/locales/fr/move.ts +++ b/src/locales/fr/move.ts @@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = { }, "zippyZap": { name: "Pika-Sprint", - effect: "Une attaque électrique rapide comme l’éclair qui auguemente l’esquive. Frappe en priorité." + effect: "Une attaque électrique rapide comme l’éclair qui augmente l’esquive. Frappe en priorité." }, "splishySplash": { name: "Pika-Splash", diff --git a/src/locales/fr/pokemon-info.ts b/src/locales/fr/pokemon-info.ts new file mode 100644 index 00000000000..0c246bd96a4 --- /dev/null +++ b/src/locales/fr/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "PV", + "HPshortened": "PV", + "ATK": "Attaque", + "ATKshortened": "Atq", + "DEF": "Défense", + "DEFshortened": "Déf", + "SPATK": "Atq. Spé.", + "SPATKshortened": "AtqSp", + "SPDEF": "Déf. Spé.", + "SPDEFshortened": "DéfSp", + "SPD": "Vitesse", + "SPDshortened": "Vit" + }, + + Type: { + "UNKNOWN": "Inconnu", + "NORMAL": "Normal", + "FIGHTING": "Combat", + "FLYING": "Vol", + "POISON": "Poison", + "GROUND": "Sol", + "ROCK": "Roche", + "BUG": "Insecte", + "GHOST": "Spectre", + "STEEL": "Acier", + "FIRE": "Feu", + "WATER": "Eau", + "GRASS": "Plante", + "ELECTRIC": "Électrik", + "PSYCHIC": "Psy", + "ICE": "Glace", + "DRAGON": "Dragon", + "DARK": "Ténèbres", + "FAIRY": "Fée", + "STELLAR": "Stellaire", + }, +} as const; diff --git a/src/locales/fr/pokemon-stat.ts b/src/locales/fr/pokemon-stat.ts deleted file mode 100644 index 62aa97fc1fd..00000000000 --- a/src/locales/fr/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "PV", - "HPshortened": "PV", - "ATK": "Attaque", - "ATKshortened": "Atq", - "DEF": "Défense", - "DEFshortened": "Déf", - "SPATK": "Atq. Spé.", - "SPATKshortened": "AtqSp", - "SPDEF": "Déf. Spé.", - "SPDEFshortened": "DéfSp", - "SPD": "Vitesse", - "SPDshortened": "Vit" -} as const; diff --git a/src/locales/fr/trainers.ts b/src/locales/fr/trainers.ts index 0f67e860186..3d22b00f89e 100644 --- a/src/locales/fr/trainers.ts +++ b/src/locales/fr/trainers.ts @@ -16,34 +16,36 @@ export const titles: SimpleTranslationEntries = { export const trainerClasses: SimpleTranslationEntries = { "ace_trainer": "Topdresseur", "ace_trainer_female": "Topdresseuse", - "ace_duo": "Ace Duo", + "ace_duo": "Topdresseurs", "artist": "Artiste", "artist_female": "Artiste", "backers": "Pompom Girls", "backpacker": "Randonneur", "backpacker_female": "Randonneuse", - "backpackers": "Backpackers", + "backpackers": "Randonneurs", "baker": "Boulangère", "battle_girl": "Combattante", "beauty": "Canon", + "beginners": "Beginners", "biker": "Motard", "black_belt": "Karatéka", "breeder": "Éleveur", "breeder_female": "Éleveuse", - "breeders": "Breeders", + "breeders": "Éleveurs", "clerk": "Employé", "clerk_female": "Employée", - "colleagues": "Colleagues", + "colleagues": "Collègues de Bureau", + "crush_kin": "Duo Baston", "cyclist": "Cycliste", "cyclist_female": "Cycliste", - "cyclists": "Cyclists", + "cyclists": "Cyclistes", "dancer": "Danseur", "dancer_female": "Danseuse", "depot_agent": "Cheminot", "doctor": "Docteur", "doctor_female": "Docteure", - "fishermen": "Pêcheur", - "fishermen_female": "Pêcheuse", + "fisherman": "Pêcheur", + "fisherman_female": "Pêcheuse", "gentleman": "Gentleman", "guitarist": "Guitariste", "guitarist_female": "Guitariste", @@ -58,51 +60,56 @@ export const trainerClasses: SimpleTranslationEntries = { "linebacker": "Quaterback", "maid": "Gouvernante", "madame": "Mondaine", - "musican": "Musicien", - "medical_team": "Medical Team", - "hex_maniac": "Hex Maniac", - "nurse": " Infirmière", + "medical_team": "Médecins", + "musician": "Musicien", + "hex_maniac": "Mystimaniac", + "nurse": "Infirmière", "nursery_aide": "Institutrice", "officer": "Policier", "parasol_lady": "Sœur Parasol", "pilot": "Pilote", - "poké_fan": "Poké Fan", - "poké_fan_family": "Poké Fan Family", + "pokefan": "Poké Fan", + "pokefan_family": "Couple de Pokéfans", "preschooler": "Petit", "preschooler_female": "Petite", - "preschoolers": "Preschoolers", + "preschoolers": "Petits", "psychic": "Kinésiste", "psychic_female": "Kinésiste", - "psychics": "Psychics", + "psychics": "Kinésistes", "pokémon_ranger": "Pokémon Ranger", - "pokémon_rangers": "Pokémon Ranger", + "pokémon_rangers": "Pokémon Rangers", "ranger": "Ranger", - "restaurant_staff": "Restaurant Staff", - "rich_boy": "Rich Boy", - "rich_couple": "Rich Couple", - "rich_kids": "Rich Kids", + "restaurant_staff": "Serveurs", + "rich": "Rich", + "rich_female": "Mondaine", + "rich_boy": "Gentleman", + "rich_couple": "Couple de Bourgeois", + "rich_kid": "Richard", + "rich_kid_female": "Mademoiselle", + "rich_kids": "Richards", "roughneck": "Loubard", "scientist": "Scientifique", "scientist_female": "Scientifique", - "scientists": "Scientists", + "scientists": "Scientifiques", "smasher": "Tenniswoman", "snow_worker": "Ouvrier Alpin", "snow_worker_female": "Ouvrière Alpine", "striker": "Footballeur", "school_kid": "Élève", "school_kid_female": "Élève", - "school_kids": "School Kids", + "school_kids": "Élèves", "swimmer": "Nageur", "swimmer_female": "Nageuse", - "swimmers": "Swimmers", + "swimmers": "Nageurs", "twins": "Jumelles", "veteran": "Vénérable", "veteran_female": "Vénérable", - "veteran_duo": "Veteran Duo", + "veteran_duo": "Vénérables", "waiter": "Serveur", "waitress": "Serveuse", "worker": "Ouvrier", "worker_female": "Ouvrière", + "workers": "Ouvriers", "youngster": "Gamin" } as const; @@ -212,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = { "kahili": "Kahili", "rika": "Cayenn", "poppy": "Popi", - "larry_elite": "Okuba", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "hassel": "Hassa", "crispin": "Rubépin", "amarys": "Nérine", @@ -220,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = { "drayton": "Irido", "blue": "Blue", "red": "Red", - "lance_champion": "Peter", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "steven": "Pierre Rochard", "wallace": "Marc", "cynthia": "Cynthia", diff --git a/src/locales/fr/weather.ts b/src/locales/fr/weather.ts index e73e51a53a2..f00e7e08a03 100644 --- a/src/locales/fr/weather.ts +++ b/src/locales/fr/weather.ts @@ -39,6 +39,6 @@ export const weather: SimpleTranslationEntries = { "harshSunClearMessage": "Les rayons du soleil s’affaiblissent !", "strongWindsStartMessage": "Un vent mystérieux se lève !", - "strongWindsLapseMessage": "Le vent mystérieux violemment !", + "strongWindsLapseMessage": "Le vent mystérieux souffle violemment !", "strongWindsClearMessage": "Le vent mystérieux s’est dissipé…" } diff --git a/src/locales/it/battle-message-ui-handler.ts b/src/locales/it/battle-message-ui-handler.ts new file mode 100644 index 00000000000..917de48fd5e --- /dev/null +++ b/src/locales/it/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "Stellare", + "ivFantastic": "Eccellente", + "ivVeryGood": "Notevole", + "ivPrettyGood": "Normale", + "ivDecent": "Sufficiente", + "ivNoGood": "Mediocre", +} as const; \ No newline at end of file diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts index 702ec0708ef..c9cf46554c0 100644 --- a/src/locales/it/battle.ts +++ b/src/locales/it/battle.ts @@ -3,6 +3,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} è apparso.", "trainerAppeared": "{{trainerName}}\nvuole combattere!", + "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", "singleWildAppeared": "Appare {{pokemonName}} selvatico!", "multiWildAppeared": "Appaiono {{pokemonName1}}\ne {{pokemonName2}} salvatici!", "playerComeBack": "Rientra, {{pokemonName}}!", @@ -22,16 +23,16 @@ export const battle: SimpleTranslationEntries = { "attackFailed": "Ma ha fallito!", "attackHitsCount": `Colpito {{count}} volta/e!`, "expGain": "{{pokemonName}} ha guadagnato\n{{exp}} Punti Esperienza!", - "levelUp": "{{pokemonName}} è salito al \nlivello {{level}}!", - "learnMove": "{{pokemonName}} impara \n{{moveName}}!", + "levelUp": "{{pokemonName}} è salito al\nlivello {{level}}!", + "learnMove": "{{pokemonName}} impara\n{{moveName}}!", "learnMovePrompt": "{{pokemonName}} vorrebbe imparare\n{{moveName}}.", - "learnMoveLimitReached": "Tuttavia, {{pokemonName}} \nconosce già quattro mosse.", - "learnMoveReplaceQuestion": "Vuoi che ne dimentichi una e al suo \nposto la sostituisca con {{moveName}}?", - "learnMoveStopTeaching": "Vuoi smettere di fargli imparare \n{{moveName}}?", + "learnMoveLimitReached": "Tuttavia, {{pokemonName}}\nconosce già quattro mosse.", + "learnMoveReplaceQuestion": "Vuoi che ne dimentichi una e al suo\nposto apprenda {{moveName}}?", + "learnMoveStopTeaching": "Vuoi smettere di fargli imparare\n{{moveName}}?", "learnMoveNotLearned": "{{pokemonName}} non ha imparato\n{{moveName}}.", "learnMoveForgetQuestion": "Quale mossa deve dimenticare?", "learnMoveForgetSuccess": "{{pokemonName}} ha dimenticato la mossa\n{{moveName}}.", - "countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Puff!", + "countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}ta-daaaa!", "learnMoveAnd": "E…", "levelCapUp": "Il livello massimo\nè aumentato a {{levelCap}}!", "moveNotImplemented": "{{moveName}} non è ancora implementata e non può essere selezionata.", @@ -50,6 +51,6 @@ export const battle: SimpleTranslationEntries = { "escapeVerbFlee": "fuggendo", "notDisabled": "{{pokemonName}}'s {{moveName}} non è più\ndisabilitata!", "skipItemQuestion": "Sei sicuro di non voler prendere nessun oggetto?", - "eggHatching": "Oh?", + "eggHatching": "Oh!", "ivScannerUseQuestion": "Vuoi usare lo scanner di IV su {{pokemonName}}?" } as const; \ No newline at end of file diff --git a/src/locales/it/berry.ts b/src/locales/it/berry.ts new file mode 100644 index 00000000000..27a30438a59 --- /dev/null +++ b/src/locales/it/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "Baccacedro", + effect: "Restituisce il 25% dei PS se i PS sono sotto il 50%", + }, + "LUM": { + name: "Baccaprugna", + effect: "Se tenuta da un Pokémon risolve qualsiasi problema di stato", + }, + "ENIGMA": { + name: "Baccaenigma", + effect: "Restituisce il 25% dei PS se viene colpito da una mossa superefficace", + }, + "LIECHI": { + name: "Baccalici", + effect: "Aumenta l'Attacco se i PS sono sotto il 25%", + }, + "GANLON": { + name: "Baccalongan", + effect: "Aumenta la Difesa se i PS sono sotto il 25%", + }, + "PETAYA": { + name: "Baccapitaya", + effect: "Aumenta l'Attacco Speciale se i PS sono sotto il 25%", + }, + "APICOT": { + name: "Baccacocca", + effect: "Aumenta la Difesa Speciale se i PS sono sotto il 25%", + }, + "SALAC": { + name: "Baccasalak", + effect: "Aumenta la Velocità se i PS sono sotto il 25%", + }, + "LANSAT": { + name: "Baccalangsa", + effect: "Aumenta la probabilità di Colpo Critico se i PS sono sotto il 25%", + }, + "STARF": { + name: "Baccambola", + effect: "Aumenta drasticamente una statistica casuale se i PS sono sotto il 25%", + }, + "LEPPA": { + name: "Baccamela", + effect: "Ripristina 10 PP a una mossa se i suoi PP raggiungono lo 0", + }, +} as const; \ No newline at end of file diff --git a/src/locales/it/config.ts b/src/locales/it/config.ts index baa252bcb16..a9c80dc673d 100644 --- a/src/locales/it/config.ts +++ b/src/locales/it/config.ts @@ -12,13 +12,14 @@ import { move } from "./move"; import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; -import { titles,trainerClasses,trainerNames } from "./trainers"; -import { splashMessages } from "./splash-messages" import { weather } from "./weather"; - +import { battleMessageUiHandler } from "./battle-message-ui-handler"; +import { berry } from "./berry"; export const itConfig = { ability: ability, @@ -27,20 +28,22 @@ export const itConfig = { commandUiHandler: commandUiHandler, egg: egg, fightUiHandler: fightUiHandler, - menuUiHandler: menuUiHandler, + growth: growth, menu: menu, + menuUiHandler: menuUiHandler, + modifierType: modifierType, move: move, + nature: nature, pokeball: pokeball, - pokemonStat: pokemonStat, pokemon: pokemon, + pokemonInfo: pokemonInfo, + splashMessages: splashMessages, starterSelectUiHandler: starterSelectUiHandler, titles: titles, trainerClasses: trainerClasses, trainerNames: trainerNames, tutorial: tutorial, - splashMessages: splashMessages, - nature: nature, - growth: growth, weather: weather, - modifierType: modifierType, -} + battleMessageUiHandler: battleMessageUiHandler, + berry: berry, +} \ No newline at end of file diff --git a/src/locales/it/modifier-type.ts b/src/locales/it/modifier-type.ts index 043d7a705d5..70303dd7acd 100644 --- a/src/locales/it/modifier-type.ts +++ b/src/locales/it/modifier-type.ts @@ -4,320 +4,320 @@ export const modifierType: ModifierTypeTranslationEntries = { ModifierType: { "AddPokeballModifierType": { name: "{{modifierCount}}x {{pokeballName}}", - description: "Receive {{pokeballName}} x{{modifierCount}} (Inventory: {{pokeballAmount}}) \nCatch Rate: {{catchRate}}", + description: "Ricevi {{pokeballName}} x{{modifierCount}} (Inventario: {{pokeballAmount}}) \nTasso di cattura: {{catchRate}}", }, "AddVoucherModifierType": { name: "{{modifierCount}}x {{voucherTypeName}}", - description: "Receive {{voucherTypeName}} x{{modifierCount}}", + description: "Ricevi {{voucherTypeName}} x{{modifierCount}}", }, "PokemonHeldItemModifierType": { extra: { - "inoperable": "{{pokemonName}} can't take\nthis item!", - "tooMany": "{{pokemonName}} has too many\nof this item!", + "inoperable": "{{pokemonName}} non può prendere\nquesto oggetto!", + "tooMany": "{{pokemonName}} ne ha troppi\ndi questo oggetto!", } }, "PokemonHpRestoreModifierType": { - description: "Restores {{restorePoints}} HP or {{restorePercent}}% HP for one Pokémon, whichever is higher", + description: "Restituisce {{restorePoints}} PS o {{restorePercent}}% PS ad un Pokémon, a seconda del valore più alto", extra: { - "fully": "Fully restores HP for one Pokémon", - "fullyWithStatus": "Fully restores HP for one Pokémon and heals any status ailment", + "fully": "Restituisce tutti i PS ad un Pokémon", + "fullyWithStatus": "Restituisce tutti i PS ad un Pokémon e lo cura da ogni stato", } }, "PokemonReviveModifierType": { - description: "Revives one Pokémon and restores {{restorePercent}}% HP", + description: "Rianima un Pokémon esausto e gli restituisce il {{restorePercent}}% PS", }, "PokemonStatusHealModifierType": { - description: "Heals any status ailment for one Pokémon", + description: "Cura tutti i problemi di stato di un Pokémon", }, "PokemonPpRestoreModifierType": { - description: "Restores {{restorePoints}} PP for one Pokémon move", + description: "Restituisce {{restorePoints}} PP per una mossa di un Pokémon ", extra: { - "fully": "Restores all PP for one Pokémon move", + "fully": "Restituisce tutti i PP di una mossa", } }, "PokemonAllMovePpRestoreModifierType": { - description: "Restores {{restorePoints}} PP for all of one Pokémon's moves", + description: "Restituisce {{restorePoints}} PP a tutte le mosse di un Pokémon", extra: { - "fully": "Restores all PP for all of one Pokémon's moves", + "fully": "Restituisce tutti i PP a tutte le mosse di un Pokémon", } }, "PokemonPpUpModifierType": { - description: "Permanently increases PP for one Pokémon move by {{upPoints}} for every 5 maximum PP (maximum 3)", + description: "Aumenta i PP di una mossa di {{upPoints}} per ogni 5 PP (massimo 3)", }, "PokemonNatureChangeModifierType": { - name: "{{natureName}} Mint", - description: "Changes a Pokémon's nature to {{natureName}} and permanently unlocks the nature for the starter.", + name: "Menta {{natureName}}", + description: "Cambia la natura del Pokémon in {{natureName}} e sblocca la natura per il Pokémon iniziale", }, "DoubleBattleChanceBoosterModifierType": { - description: "Doubles the chance of an encounter being a double battle for {{battleCount}} battles", + description: "Raddoppia la possibilità di imbattersi in doppie battaglie per {{battleCount}} battaglie", }, "TempBattleStatBoosterModifierType": { - description: "Increases the {{tempBattleStatName}} of all party members by 1 stage for 5 battles", + description: "Aumenta {{tempBattleStatName}} di un livello a tutti i Pokémon nel gruppo per 5 battaglie", }, "AttackTypeBoosterModifierType": { - description: "Increases the power of a Pokémon's {{moveType}}-type moves by 20%", + description: "Aumenta la potenza delle mosse di tipo {{moveType}} del 20% per un Pokémon", }, "PokemonLevelIncrementModifierType": { - description: "Increases a Pokémon's level by 1", + description: "Fa salire un Pokémon di un livello", }, "AllPokemonLevelIncrementModifierType": { - description: "Increases all party members' level by 1", + description: "Aumenta il livello di tutti i Pokémon nel gruppo di 1", }, "PokemonBaseStatBoosterModifierType": { - description: "Increases the holder's base {{statName}} by 10%. The higher your IVs, the higher the stack limit.", + description: "Aumenta {{statName}} di base del possessore del 10%", }, "AllPokemonFullHpRestoreModifierType": { - description: "Restores 100% HP for all Pokémon", + description: "Recupera il 100% dei PS per tutti i Pokémon", }, "AllPokemonFullReviveModifierType": { - description: "Revives all fainted Pokémon, fully restoring HP", + description: "Rianima tutti i Pokémon esausti restituendogli tutti i PS", }, "MoneyRewardModifierType": { - description: "Grants a {{moneyMultiplier}} amount of money (₽{{moneyAmount}})", + description: "Garantisce una {{moneyMultiplier}} quantità di soldi (₽{{moneyAmount}})", extra: { - "small": "small", - "moderate": "moderate", - "large": "large", + "small": "poca", + "moderate": "moderata", + "large": "grande", }, }, "ExpBoosterModifierType": { - description: "Increases gain of EXP. Points by {{boostPercent}}%", + description: "Aumenta il guadagno di Punti Esperienza del {{boostPercent}}%", }, "PokemonExpBoosterModifierType": { - description: "Increases the holder's gain of EXP. Points by {{boostPercent}}%", + description: "Aumenta il guadagno di Punti Esperienza del possessore del {{boostPercent}}%", }, "PokemonFriendshipBoosterModifierType": { - description: "Increases friendship gain per victory by 50%", + description: "Aumenta del 50% il guadagno di amicizia per vittoria", }, "PokemonMoveAccuracyBoosterModifierType": { - description: "Increases move accuracy by {{accuracyAmount}} (maximum 100)", + description: "Aumenta l'accuratezza delle mosse di {{accuracyAmount}} (massimo 100)", }, "PokemonMultiHitModifierType": { - description: "Attacks hit one additional time at the cost of a 60/75/82.5% power reduction per stack respectively", + description: "Gli attacchi colpiscono una volta in più al costo di una riduzione di potenza del 60/75/82,5% per mossa", }, "TmModifierType": { - name: "TM{{moveId}} - {{moveName}}", - description: "Teach {{moveName}} to a Pokémon", + name: "MT{{moveId}} - {{moveName}}", + description: "Insegna {{moveName}} a un Pokémon", }, "EvolutionItemModifierType": { - description: "Causes certain Pokémon to evolve", + description: "Fa evolvere determinate specie di Pokémon", }, "FormChangeItemModifierType": { - description: "Causes certain Pokémon to change form", + description: "Fa cambiare forma a determinati Pokémon", }, "FusePokemonModifierType": { - description: "Combines two Pokémon (transfers Ability, splits base stats and types, shares move pool)", + description: "Combina due Pokémon (trasferisce i poteri, divide le statistiche e i tipi base, condivide il pool di mosse)", }, "TerastallizeModifierType": { - name: "{{teraType}} Tera Shard", - description: "{{teraType}} Terastallizes the holder for up to 10 battles", + name: "Teralite {{teraType}}", + description: "Teracristallizza in {{teraType}} il possessore per massimo 10 battaglie", }, "ContactHeldItemTransferChanceModifierType": { - description: "Upon attacking, there is a {{chancePercent}}% chance the foe's held item will be stolen", + description: "Quando si attacca, c'è una probabilità del {{chancePercent}}% che l'oggetto in possesso del nemico venga rubato", }, "TurnHeldItemTransferModifierType": { - description: "Every turn, the holder acquires one held item from the foe", + description: "Ogni turno, il possessore acquisisce un oggetto posseduto dal nemico", }, "EnemyAttackStatusEffectChanceModifierType": { - description: "Adds a {{chancePercent}}% chance to inflict {{statusEffect}} with attack moves", + description: "Aggiunge una probabilità del {{chancePercent}}% di infliggere {{statusEffect}} con le mosse d'attacco", }, "EnemyEndureChanceModifierType": { - description: "Adds a {{chancePercent}}% chance of enduring a hit", + description: "Aggiunge una probabilità del {{probabilitàPercent}}% di resistere ad un colpo", }, - "RARE_CANDY": { name: "Rare Candy" }, - "RARER_CANDY": { name: "Rarer Candy" }, + "RARE_CANDY": { name: "Caramella Rara" }, + "RARER_CANDY": { name: "Caramella Molto Rara" }, - "MEGA_BRACELET": { name: "Mega Bracelet", description: "Mega Stones become available" }, - "DYNAMAX_BAND": { name: "Dynamax Band", description: "Max Mushrooms become available" }, - "TERA_ORB": { name: "Tera Orb", description: "Tera Shards become available" }, + "MEGA_BRACELET": { name: "Megapolsiera", description: "Le Megapietre sono disponibili" }, + "DYNAMAX_BAND": { name: "Polsino Dynamax", description: "I Fungomax sono disponibili" }, + "TERA_ORB": { name: "Terasfera", description: "I Teraliti sono disponibili" }, - "MAP": { name: "Map", description: "Allows you to choose your destination at a crossroads" }, + "MAP": { name: "Mappa", description: "Permette di scegliere la propria strada a un bivio" }, - "POTION": { name: "Potion" }, - "SUPER_POTION": { name: "Super Potion" }, - "HYPER_POTION": { name: "Hyper Potion" }, - "MAX_POTION": { name: "Max Potion" }, - "FULL_RESTORE": { name: "Full Restore" }, + "POTION": { name: "Pozione" }, + "SUPER_POTION": { name: "Superpozione" }, + "HYPER_POTION": { name: "Iperpozione" }, + "MAX_POTION": { name: "Pozione Max" }, + "FULL_RESTORE": { name: "Ricarica Totale" }, - "REVIVE": { name: "Revive" }, - "MAX_REVIVE": { name: "Max Revive" }, + "REVIVE": { name: "Revitalizzante" }, + "MAX_REVIVE": { name: "Revitalizzante Max" }, - "FULL_HEAL": { name: "Full Heal" }, + "FULL_HEAL": { name: "Cura Totale" }, - "SACRED_ASH": { name: "Sacred Ash" }, + "SACRED_ASH": { name: "Cenere Magica" }, - "REVIVER_SEED": { name: "Reviver Seed", description: "Revives the holder for 1/2 HP upon fainting" }, + "REVIVER_SEED": { name: "Revitalseme", description: "Il possessore recupera 1/2 di PS in caso di svenimento" }, - "ETHER": { name: "Ether" }, - "MAX_ETHER": { name: "Max Ether" }, + "ETHER": { name: "Etere" }, + "MAX_ETHER": { name: "Etere Max" }, - "ELIXIR": { name: "Elixir" }, - "MAX_ELIXIR": { name: "Max Elixir" }, + "ELIXIR": { name: "Elisir" }, + "MAX_ELIXIR": { name: "Elisir Max" }, - "PP_UP": { name: "PP Up" }, - "PP_MAX": { name: "PP Max" }, + "PP_UP": { name: "PP-su" }, + "PP_MAX": { name: "PP-max" }, - "LURE": { name: "Lure" }, - "SUPER_LURE": { name: "Super Lure" }, - "MAX_LURE": { name: "Max Lure" }, + "LURE": { name: "Profumo Invito" }, + "SUPER_LURE": { name: "Profumo Invito Super" }, + "MAX_LURE": { name: "Profumo Invito Max" }, - "MEMORY_MUSHROOM": { name: "Memory Mushroom", description: "Recall one Pokémon's forgotten move" }, + "MEMORY_MUSHROOM": { name: "Fungo della Memoria", description: "Ricorda la mossa dimenticata di un Pokémon" }, - "EXP_SHARE": { name: "EXP. All", description: "Non-participants receive 20% of a single participant's EXP. Points" }, - "EXP_BALANCE": { name: "EXP. Balance", description: "Weighs EXP. Points received from battles towards lower-leveled party members" }, + "EXP_SHARE": { name: "Condividi Esperienza", description: "Tutti i Pokémon della squadra ricevono il 20% dei Punti Esperienza dalla lotta anche se non vi hanno partecipato" }, + "EXP_BALANCE": { name: "Bilancia Esperienza", description: "Bilancia i Punti Esperienza ricevuti verso i Pokémon del gruppo di livello inferiore" }, - "OVAL_CHARM": { name: "Oval Charm", description: "When multiple Pokémon participate in a battle, each gets an extra 10% of the total EXP" }, + "OVAL_CHARM": { name: "Ovamuleto", description: "Quando più Pokémon partecipano a una battaglia, ognuno di essi riceve il 10% in più dell'esperienza totale" }, - "EXP_CHARM": { name: "EXP. Charm" }, - "SUPER_EXP_CHARM": { name: "Super EXP. Charm" }, - "GOLDEN_EXP_CHARM": { name: "Golden EXP. Charm" }, + "EXP_CHARM": { name: "Esperienzamuleto" }, + "SUPER_EXP_CHARM": { name: "Esperienzamuleto Super" }, + "GOLDEN_EXP_CHARM": { name: "Esperienzamuleto Oro" }, - "LUCKY_EGG": { name: "Lucky Egg" }, - "GOLDEN_EGG": { name: "Golden Egg" }, + "LUCKY_EGG": { name: "Uovo Fortunato" }, + "GOLDEN_EGG": { name: "Uovo d'Oro" }, - "SOOTHE_BELL": { name: "Soothe Bell" }, + "SOOTHE_BELL": { name: "Calmanella" }, - "SOUL_DEW": { name: "Soul Dew", description: "Increases the influence of a Pokémon's nature on its stats by 10% (additive)" }, + "SOUL_DEW": { name: "Cuorugiada", description: "Aumenta del 10% l'influenza della natura di un Pokémon sulle sue statistiche (Aggiuntivo)" }, - "NUGGET": { name: "Nugget" }, - "BIG_NUGGET": { name: "Big Nugget" }, - "RELIC_GOLD": { name: "Relic Gold" }, + "NUGGET": { name: "Pepita" }, + "BIG_NUGGET": { name: "Granpepita" }, + "RELIC_GOLD": { name: " Dobloantico" }, - "AMULET_COIN": { name: "Amulet Coin", description: "Increases money rewards by 20%" }, - "GOLDEN_PUNCH": { name: "Golden Punch", description: "Grants 50% of damage inflicted as money" }, - "COIN_CASE": { name: "Coin Case", description: "After every 10th battle, receive 10% of your money in interest" }, + "AMULET_COIN": { name: "Monetamuleto", description: "Aumenta le ricompense in denaro del 20%" }, + "GOLDEN_PUNCH": { name: "Pugno Dorato", description: "Garantisce il 50% dei danni inflitti come denaro" }, + "COIN_CASE": { name: " Salvadanaio", description: "Dopo ogni 10° battaglia, riceverete il 10% del vostro denaro in interessi" }, - "LOCK_CAPSULE": { name: "Lock Capsule", description: "Allows you to lock item rarities when rerolling items" }, + "LOCK_CAPSULE": { name: "Capsula Scrigno", description: "Permette di bloccare le rarità degli oggetti quando si fa un reroll degli oggetti" }, - "GRIP_CLAW": { name: "Grip Claw" }, - "WIDE_LENS": { name: "Wide Lens" }, + "GRIP_CLAW": { name: "Presartigli" }, + "WIDE_LENS": { name: "Grandelente" }, - "MULTI_LENS": { name: "Multi Lens" }, + "MULTI_LENS": { name: "Multilente" }, - "HEALING_CHARM": { name: "Healing Charm", description: "Increases the effectiveness of HP restoring moves and items by 10% (excludes Revives)" }, - "CANDY_JAR": { name: "Candy Jar", description: "Increases the number of levels added by Rare Candy items by 1" }, + "HEALING_CHARM": { name: "Curamuleto", description: "Aumenta del 10% l'efficacia delle mosse e degli oggetti che ripristinano i PS (escluse le rianimazioni)" }, + "CANDY_JAR": { name: "Barattolo di caramelle", description: "Aumenta di 1 il numero di livelli aggiunti dalle Caramelle Rare" }, - "BERRY_POUCH": { name: "Berry Pouch", description: "Adds a 25% chance that a used berry will not be consumed" }, + "BERRY_POUCH": { name: "Porta Bacche", description: "Aggiunge il 25% di possibilità che una bacca usata non venga consumata" }, - "FOCUS_BAND": { name: "Focus Band", description: "Adds a 10% chance to survive with 1 HP after being damaged enough to faint" }, + "FOCUS_BAND": { name: "Bandana", description: "Chi ce l'ha ottiene il 10% di possibilità aggiuntivo di evitare un potenziale KO e rimanere con un solo PS" }, - "QUICK_CLAW": { name: "Quick Claw", description: "Adds a 10% chance to move first regardless of speed (after priority)" }, + "QUICK_CLAW": { name: "Rapidartigli", description: "Aggiunge una probabilità del 10% di muoversi per primi, indipendentemente dalla velocità (dopo la priorità)" }, - "KINGS_ROCK": { name: "King's Rock", description: "Adds a 10% chance an attack move will cause the opponent to flinch" }, + "KINGS_ROCK": { name: "Roccia di re", description: "Aggiunge il 10% di possibilità che una mossa d'attacco faccia tentennare l'avversario" }, - "LEFTOVERS": { name: "Leftovers", description: "Heals 1/16 of a Pokémon's maximum HP every turn" }, - "SHELL_BELL": { name: "Shell Bell", description: "Heals 1/8 of a Pokémon's dealt damage" }, + "LEFTOVERS": { name: "Avanzi", description: "Ripristina 1/16 dei PS massimi di un Pokémon ogni turno" }, + "SHELL_BELL": { name: "Conchinella", description: "Guarisce 1/8 del danno inflitto a un Pokémon" }, - "BATON": { name: "Baton", description: "Allows passing along effects when switching Pokémon, which also bypasses traps" }, + "BATON": { name: "Staffetta", description: "Permette di trasmettere gli effetti quando si cambia Pokémon, aggirando anche le trappole" }, - "SHINY_CHARM": { name: "Shiny Charm", description: "Dramatically increases the chance of a wild Pokémon being Shiny" }, - "ABILITY_CHARM": { name: "Ability Charm", description: "Dramatically increases the chance of a wild Pokémon having a Hidden Ability" }, + "SHINY_CHARM": { name: "Cromamuleto", description: "Misterioso amuleto luminoso che aumenta la probabilità di incontrare Pokémon cromatici" }, + "ABILITY_CHARM": { name: "Abilitamuleto", description: "Aumenta drasticamente la possibilità che un Pokémon selvatico abbia un'abilità nascosta" }, - "IV_SCANNER": { name: "IV Scanner", description: "Allows scanning the IVs of wild Pokémon. 2 IVs are revealed per stack. The best IVs are shown first" }, + "IV_SCANNER": { name: "Scanner IV", description: "Permette di scansionare gli IV dei Pokémon selvatici. Vengono rivelati 2 IV per pila. I migliori IV vengono mostrati per primi" }, - "DNA_SPLICERS": { name: "DNA Splicers" }, + "DNA_SPLICERS": { name: " Cuneo DNA" }, - "MINI_BLACK_HOLE": { name: "Mini Black Hole" }, + "MINI_BLACK_HOLE": { name: "Piccolo Buco Nero" }, - "GOLDEN_POKEBALL": { name: "Golden Poké Ball", description: "Adds 1 extra item option at the end of every battle" }, + "GOLDEN_POKEBALL": { name: "Poké Ball Oro", description: "Aggiunge 1 opzione di oggetto extra alla fine di ogni battaglia" }, - "ENEMY_DAMAGE_BOOSTER": { name: "Damage Token", description: "Increases damage by 5%" }, - "ENEMY_DAMAGE_REDUCTION": { name: "Protection Token", description: "Reduces incoming damage by 2.5%" }, - "ENEMY_HEAL": { name: "Recovery Token", description: "Heals 2% of max HP every turn" }, - "ENEMY_ATTACK_POISON_CHANCE": { name: "Poison Token" }, - "ENEMY_ATTACK_PARALYZE_CHANCE": { name: "Paralyze Token" }, - "ENEMY_ATTACK_SLEEP_CHANCE": { name: "Sleep Token" }, - "ENEMY_ATTACK_FREEZE_CHANCE": { name: "Freeze Token" }, - "ENEMY_ATTACK_BURN_CHANCE": { name: "Burn Token" }, - "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { name: "Full Heal Token", description: "Adds a 10% chance every turn to heal a status condition" }, - "ENEMY_ENDURE_CHANCE": { name: "Endure Token" }, - "ENEMY_FUSED_CHANCE": { name: "Fusion Token", description: "Adds a 1% chance that a wild Pokémon will be a fusion" }, + "ENEMY_DAMAGE_BOOSTER": { name: "Gettone del Danno", description: "Aumenta il danno del 5%" }, + "ENEMY_DAMAGE_REDUCTION": { name: "Gettone della Protezione", description: "Riduce i danni ricevuti del 2.5%" }, + "ENEMY_HEAL": { name: "Gettone del Recupero", description: "Cura il 2% dei PS massimi ogni turno" }, + "ENEMY_ATTACK_POISON_CHANCE": { name: "Gettone del Veleno" }, + "ENEMY_ATTACK_PARALYZE_CHANCE": { name: "Gettone della Paralisi" }, + "ENEMY_ATTACK_SLEEP_CHANCE": { name: "Gettone del Sonno" }, + "ENEMY_ATTACK_FREEZE_CHANCE": { name: "Gettone del Congelamento" }, + "ENEMY_ATTACK_BURN_CHANCE": { name: "Gettone della Bruciatura" }, + "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { name: "Gettone Guarigione Completa", description: "Aggiunge una probabilità del 10% a ogni turno di curare una condizione di stato" }, + "ENEMY_ENDURE_CHANCE": { name: "Gettone di Resistenza" }, + "ENEMY_FUSED_CHANCE": { name: "Gettone della fusione", description: "Aggiunge l'1% di possibilità che un Pokémon selvatico sia una fusione" }, }, TempBattleStatBoosterItem: { - "x_attack": "X Attack", - "x_defense": "X Defense", - "x_sp_atk": "X Sp. Atk", - "x_sp_def": "X Sp. Def", - "x_speed": "X Speed", - "x_accuracy": "X Accuracy", - "dire_hit": "Dire Hit", + "x_attack": "Attacco X", + "x_defense": "Difesa X", + "x_sp_atk": "Att. Speciale X", + "x_sp_def": "Dif. Speciale X", + "x_speed": "Velocità X", + "x_accuracy": "Precisione X", + "dire_hit": "Supercolpo", }, AttackTypeBoosterItem: { - "silk_scarf": "Silk Scarf", - "black_belt": "Black Belt", - "sharp_beak": "Sharp Beak", - "poison_barb": "Poison Barb", - "soft_sand": "Soft Sand", - "hard_stone": "Hard Stone", - "silver_powder": "Silver Powder", - "spell_tag": "Spell Tag", - "metal_coat": "Metal Coat", - "charcoal": "Charcoal", - "mystic_water": "Mystic Water", - "miracle_seed": "Miracle Seed", - "magnet": "Magnet", - "twisted_spoon": "Twisted Spoon", - "never_melt_ice": "Never-Melt Ice", - "dragon_fang": "Dragon Fang", - "black_glasses": "Black Glasses", - "fairy_feather": "Fairy Feather", + "silk_scarf": "Sciarpa seta", + "black_belt": "Cinturanera", + "sharp_beak": "Beccaffilato", + "poison_barb": "Velenaculeo", + "soft_sand": "Sabbia soffice", + "hard_stone": "Pietradura", + "silver_powder": "Argenpolvere", + "spell_tag": "Spettrotarga", + "metal_coat": "Metalcopertura", + "charcoal": "Carbonella", + "mystic_water": "Acqua magica", + "miracle_seed": "Miracolseme", + "magnet": "Magnete", + "twisted_spoon": "Cucchiaio torto", + "never_melt_ice": "Gelomai", + "dragon_fang": "Dente di drago", + "black_glasses": "Occhialineri", + "fairy_feather": "Piuma fatata", }, BaseStatBoosterItem: { - "hp_up": "HP Up", - "protein": "Protein", - "iron": "Iron", - "calcium": "Calcium", - "zinc": "Zinc", - "carbos": "Carbos", + "hp_up": "PS-su", + "protein": "Proteina", + "iron": "Ferro", + "calcium": "Calcio", + "zinc": "Zinco", + "carbos": "Carburante", }, EvolutionItem: { - "NONE": "None", + "NONE": "Nessuno", - "LINKING_CORD": "Linking Cord", - "SUN_STONE": "Sun Stone", - "MOON_STONE": "Moon Stone", - "LEAF_STONE": "Leaf Stone", - "FIRE_STONE": "Fire Stone", - "WATER_STONE": "Water Stone", - "THUNDER_STONE": "Thunder Stone", - "ICE_STONE": "Ice Stone", - "DUSK_STONE": "Dusk Stone", - "DAWN_STONE": "Dawn Stone", - "SHINY_STONE": "Shiny Stone", - "CRACKED_POT": "Cracked Pot", - "SWEET_APPLE": "Sweet Apple", - "TART_APPLE": "Tart Apple", - "STRAWBERRY_SWEET": "Strawberry Sweet", - "UNREMARKABLE_TEACUP": "Unremarkable Teacup", + "LINKING_CORD": "Filo dell'unione", + "SUN_STONE": "Pietrasolare", + "MOON_STONE": "Pietralunare", + "LEAF_STONE": "Pietrafoglia", + "FIRE_STONE": "Pietrafocaia", + "WATER_STONE": "Pietraidrica", + "THUNDER_STONE": "Pietratuono", + "ICE_STONE": "Pietragelo", + "DUSK_STONE": "Neropietra", + "DAWN_STONE": "Pietralbore", + "SHINY_STONE": "Pietrabrillo", + "CRACKED_POT": "Teiera rotta", + "SWEET_APPLE": "Dolcepomo", + "TART_APPLE": "Aspropomo", + "STRAWBERRY_SWEET": "Bonbonfragola", + "UNREMARKABLE_TEACUP": "Tazza dozzinale", - "CHIPPED_POT": "Chipped Pot", - "BLACK_AUGURITE": "Black Augurite", - "GALARICA_CUFF": "Galarica Cuff", - "GALARICA_WREATH": "Galarica Wreath", - "PEAT_BLOCK": "Peat Block", - "AUSPICIOUS_ARMOR": "Auspicious Armor", - "MALICIOUS_ARMOR": "Malicious Armor", - "MASTERPIECE_TEACUP": "Masterpiece Teacup", - "METAL_ALLOY": "Metal Alloy", - "SCROLL_OF_DARKNESS": "Scroll Of Darkness", - "SCROLL_OF_WATERS": "Scroll Of Waters", - "SYRUPY_APPLE": "Syrupy Apple", + "CHIPPED_POT": "Teiera crepata", + "BLACK_AUGURITE": "Augite nera", + "GALARICA_CUFF": "Fascia Galarnoce", + "GALARICA_WREATH": "Corona Galarnoce", + "PEAT_BLOCK": "Blocco di torba", + "AUSPICIOUS_ARMOR": "Armatura fausta", + "MALICIOUS_ARMOR": "Armatura infausta", + "MASTERPIECE_TEACUP": "Tazza eccezionale", + "METAL_ALLOY": "Metallo composito", + "SCROLL_OF_DARKNESS": "Rotolo del Buio", + "SCROLL_OF_WATERS": "Rotolo dell'Acqua", + "SYRUPY_APPLE": "Sciroppomo", }, FormChangeItem: { - "NONE": "None", + "NONE": "Nessuno", - "ABOMASITE": "Abomasite", + "ABOMASITE": "Abomasnowite", "ABSOLITE": "Absolite", "AERODACTYLITE": "Aerodactylite", "AGGRONITE": "Aggronite", - "ALAKAZITE": "Alakazite", - "ALTARIANITE": "Altarianite", + "ALAKAZITE": "Alakazamite", + "ALTARIANITE": "Altarite", "AMPHAROSITE": "Ampharosite", "AUDINITE": "Audinite", "BANETTITE": "Banettite", "BEEDRILLITE": "Beedrillite", - "BLASTOISINITE": "Blastoisinite", + "BLASTOISINITE": "Blastoisite", "BLAZIKENITE": "Blazikenite", "CAMERUPTITE": "Cameruptite", "CHARIZARDITE_X": "Charizardite X", @@ -327,83 +327,61 @@ export const modifierType: ModifierTypeTranslationEntries = { "GARCHOMPITE": "Garchompite", "GARDEVOIRITE": "Gardevoirite", "GENGARITE": "Gengarite", - "GLALITITE": "Glalitite", + "GLALITITE": "Glalite", "GYARADOSITE": "Gyaradosite", "HERACRONITE": "Heracronite", - "HOUNDOOMINITE": "Houndoominite", + "HOUNDOOMINITE": "Houndoomite", "KANGASKHANITE": "Kangaskhanite", "LATIASITE": "Latiasite", "LATIOSITE": "Latiosite", "LOPUNNITE": "Lopunnite", - "LUCARIONITE": "Lucarionite", - "MANECTITE": "Manectite", + "LUCARIONITE": "Lucarite", + "MANECTITE": "Manectricite", "MAWILITE": "Mawilite", "MEDICHAMITE": "Medichamite", "METAGROSSITE": "Metagrossite", - "MEWTWONITE_X": "Mewtwonite X", - "MEWTWONITE_Y": "Mewtwonite Y", + "MEWTWONITE_X": "Mewtwoite X", + "MEWTWONITE_Y": "Mewtwoite Y", "PIDGEOTITE": "Pidgeotite", "PINSIRITE": "Pinsirite", "RAYQUAZITE": "Rayquazite", - "SABLENITE": "Sablenite", + "SABLENITE": "Sableyite", "SALAMENCITE": "Salamencite", "SCEPTILITE": "Sceptilite", "SCIZORITE": "Scizorite", - "SHARPEDONITE": "Sharpedonite", - "SLOWBRONITE": "Slowbronite", + "SHARPEDONITE": "Sharpedite", + "SLOWBRONITE": "Slowbroite", "STEELIXITE": "Steelixite", "SWAMPERTITE": "Swampertite", "TYRANITARITE": "Tyranitarite", "VENUSAURITE": "Venusaurite", - "BLUE_ORB": "Blue Orb", - "RED_ORB": "Red Orb", - "SHARP_METEORITE": "Sharp Meteorite", - "HARD_METEORITE": "Hard Meteorite", - "SMOOTH_METEORITE": "Smooth Meteorite", - "ADAMANT_CRYSTAL": "Adamant Crystal", - "LUSTROUS_ORB": "Lustrous Orb", - "GRISEOUS_CORE": "Griseous Core", - "REVEAL_GLASS": "Reveal Glass", + "BLUE_ORB": "Gemma Blu", + "RED_ORB": "Gemma Rossa", + "SHARP_METEORITE": "Meteorite Tagliente", + "HARD_METEORITE": "Meteorite Dura", + "SMOOTH_METEORITE": "Meteorite Liscia", + "ADAMANT_CRYSTAL": "Adamasferoide", + "LUSTROUS_ORB": "Splendisfera", + "GRISEOUS_CORE": "Grigiosferoide", + "REVEAL_GLASS": "Verispecchio", "GRACIDEA": "Gracidea", - "MAX_MUSHROOMS": "Max Mushrooms", - "DARK_STONE": "Dark Stone", - "LIGHT_STONE": "Light Stone", - "PRISON_BOTTLE": "Prison Bottle", - "N_LUNARIZER": "N Lunarizer", - "N_SOLARIZER": "N Solarizer", - "RUSTED_SWORD": "Rusted Sword", - "RUSTED_SHIELD": "Rusted Shield", - "ICY_REINS_OF_UNITY": "Icy Reins Of Unity", - "SHADOW_REINS_OF_UNITY": "Shadow Reins Of Unity", - "WELLSPRING_MASK": "Wellspring Mask", - "HEARTHFLAME_MASK": "Hearthflame Mask", - "CORNERSTONE_MASK": "Cornerstone Mask", - "SHOCK_DRIVE": "Shock Drive", - "BURN_DRIVE": "Burn Drive", - "CHILL_DRIVE": "Chill Drive", - "DOUSE_DRIVE": "Douse Drive", - }, - TeraType: { - "UNKNOWN": "Unknown", - "NORMAL": "Normal", - "FIGHTING": "Fighting", - "FLYING": "Flying", - "POISON": "Poison", - "GROUND": "Ground", - "ROCK": "Rock", - "BUG": "Bug", - "GHOST": "Ghost", - "STEEL": "Steel", - "FIRE": "Fire", - "WATER": "Water", - "GRASS": "Grass", - "ELECTRIC": "Electric", - "PSYCHIC": "Psychic", - "ICE": "Ice", - "DRAGON": "Dragon", - "DARK": "Dark", - "FAIRY": "Fairy", - "STELLAR": "Stellar", + "MAX_MUSHROOMS": "Fungomax", + "DARK_STONE": "Scurolite", + "LIGHT_STONE": "Chiarolite", + "PRISON_BOTTLE": "Vaso del Vincolo", + "N_LUNARIZER": "Necrolunix", + "N_SOLARIZER": "Necrosolix", + "RUSTED_SWORD": "Spada Rovinata", + "RUSTED_SHIELD": "Scudo Rovinato", + "ICY_REINS_OF_UNITY": "Briglie Legame Giaccio", + "SHADOW_REINS_OF_UNITY": "Briglie legame Ombra", + "WELLSPRING_MASK": "Maschera Pozzo", + "HEARTHFLAME_MASK": "Maschera Focolare", + "CORNERSTONE_MASK": "Maschera Fondamenta", + "SHOCK_DRIVE": "Voltmodulo", + "BURN_DRIVE": "Piromodulo", + "CHILL_DRIVE": "Gelomodulo", + "DOUSE_DRIVE": "Idromodulo", }, } as const; \ No newline at end of file diff --git a/src/locales/it/pokemon-info.ts b/src/locales/it/pokemon-info.ts new file mode 100644 index 00000000000..617b2157da2 --- /dev/null +++ b/src/locales/it/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "PS Max", + "HPshortened": "PS", + "ATK": "Attacco", + "ATKshortened": "Att", + "DEF": "Difesa", + "DEFshortened": "Dif", + "SPATK": "Att. Sp.", + "SPATKshortened": "AttSp", + "SPDEF": "Dif. Sp.", + "SPDEFshortened": "DifSp", + "SPD": "Velocità", + "SPDshortened": "Vel" + }, + + Type: { + "UNKNOWN": "Sconosciuto", + "NORMAL": "Normale", + "FIGHTING": "Lotta", + "FLYING": "Volante", + "POISON": "Veleno", + "GROUND": "Terra", + "ROCK": "Roccia", + "BUG": "Coleottero", + "GHOST": "Spettro", + "STEEL": "Acciaio", + "FIRE": "Fuoco", + "WATER": "Acqua", + "GRASS": "Erba", + "ELECTRIC": "Elettro", + "PSYCHIC": "Psico", + "ICE": "Ghiaccio", + "DRAGON": "Drago", + "DARK": "Buio", + "FAIRY": "Folletto", + "STELLAR": "Astrale", + }, +} as const; diff --git a/src/locales/it/pokemon-stat.ts b/src/locales/it/pokemon-stat.ts deleted file mode 100644 index b2c023aa383..00000000000 --- a/src/locales/it/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "PS Max", - "HPshortened": "PS", - "ATK": "Attacco", - "ATKshortened": "Att", - "DEF": "Difesa", - "DEFshortened": "Dif", - "SPATK": "Att. Sp.", - "SPATKshortened": "AttSp", - "SPDEF": "Dif. Sp.", - "SPDEFshortened": "DifSp", - "SPD": "Velocità", - "SPDshortened": "Vel" -} as const; diff --git a/src/locales/it/trainers.ts b/src/locales/it/trainers.ts index c4acd85c44e..24c40acdac4 100644 --- a/src/locales/it/trainers.ts +++ b/src/locales/it/trainers.ts @@ -2,13 +2,13 @@ import {SimpleTranslationEntries} from "#app/plugins/i18n"; // Titles of special trainers like gym leaders, elite four, and the champion export const titles: SimpleTranslationEntries = { - "elite_four": "Elite Four", - "gym_leader": "Gym Leader", - "gym_leader_female": "Gym Leader", - "champion": "Champion", - "rival": "Rival", - "professor": "Professor", - "frontier_brain": "Frontier Brain", + "elite_four": "Superquattro", + "gym_leader": "Capopalestra", + "gym_leader_female": "Capopalestra", + "champion": "Campione", + "rival": "Rivale", + "professor": "Professore", + "frontier_brain": "Asso Lotta", // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc. } as const; @@ -44,8 +44,8 @@ export const trainerClasses: SimpleTranslationEntries = { "depot_agent": "Depot Agent", "doctor": "Doctor", "doctor_female": "Doctor", - "fishermen": "Fishermen", - "fishermen_female": "Fishermen", + "fisherman": "Fisherman", + "fisherman_female": "Fisherman", "gentleman": "Gentleman", "guitarist": "Guitarist", "guitarist_female": "Guitarist", @@ -61,15 +61,15 @@ export const trainerClasses: SimpleTranslationEntries = { "maid": "Maid", "madame": "Madame", "medical_team": "Medical Team", - "musican": "Musician", + "musician": "Musician", "hex_maniac": "Hex Maniac", "nurse": "Nurse", "nursery_aide": "Nursery Aide", "officer": "Officer", "parasol_lady": "Parasol Lady", "pilot": "Pilot", - "poké_fan": "Poké Fan", - "poké_fan_family": "Poké Fan Family", + "pokefan": "Poké Fan", + "pokefan_family": "Poké Fan Family", "preschooler": "Preschooler", "preschooler_female": "Preschooler", "preschoolers": "Preschoolers", @@ -80,8 +80,12 @@ export const trainerClasses: SimpleTranslationEntries = { "pokémon_rangers": "Pokémon Ranger", "ranger": "Ranger", "restaurant_staff": "Restaurant Staff", + "rich": "Rich", + "rich_female": "Rich", "rich_boy": "Rich Boy", "rich_couple": "Rich Couple", + "rich_kid": "Rich Kid", + "rich_kid_female": "Rich Kid", "rich_kids": "Rich Kids", "roughneck": "Roughneck", "scientist": "Scientist", @@ -105,6 +109,7 @@ export const trainerClasses: SimpleTranslationEntries = { "waitress": "Waitress", "worker": "Worker", "worker_female": "Worker", + "workers": "Workers", "youngster": "Youngster" } as const; @@ -214,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = { "kahili": "Kahili", "rika": "Rika", "poppy": "Poppy", - "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "hassel": "Hassel", "crispin": "Crispin", "amarys": "Amarys", @@ -222,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = { "drayton": "Drayton", "blue": "Blue", "red": "Red", - "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "steven": "Steven", "wallace": "Wallace", "cynthia": "Cynthia", diff --git a/src/locales/pt_BR/ability-trigger.ts b/src/locales/pt_BR/ability-trigger.ts new file mode 100644 index 00000000000..f539af8373a --- /dev/null +++ b/src/locales/pt_BR/ability-trigger.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const abilityTriggers: SimpleTranslationEntries = { + 'blockRecoilDamage' : `{{abilityName}} de {{pokemonName}}\nprotegeu-o do dano de recuo!`, +} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/battle-message-ui-handler.ts b/src/locales/pt_BR/battle-message-ui-handler.ts new file mode 100644 index 00000000000..03a5b464ecb --- /dev/null +++ b/src/locales/pt_BR/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "Melhor", + "ivFantastic": "Fantástico", + "ivVeryGood": "Muito Bom", + "ivPrettyGood": "Bom", + "ivDecent": "Regular", + "ivNoGood": "Ruim", +} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts index 39f889deeac..cc49abc7a7c 100644 --- a/src/locales/pt_BR/battle.ts +++ b/src/locales/pt_BR/battle.ts @@ -3,12 +3,13 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} apareceu.", "trainerAppeared": "{{trainerName}}\nquer batalhar!", + "trainerAppearedDouble": "{{trainerName}}\nquerem batalhar!", "singleWildAppeared": "Um {{pokemonName}} selvagem apareceu!", "multiWildAppeared": "Um {{pokemonName1}} e um {{pokemonName2}} selvagens\napareceram!", "playerComeBack": "{{pokemonName}}, retorne!", "trainerComeBack": "{{trainerName}} retirou {{pokemonName}} da batalha!", "playerGo": "{{pokemonName}}, eu escolho você!", - "trainerGo": "{{trainerName}} enviou {{pokemonName}}!", + "trainerGo": "{{trainerName}} escolheu {{pokemonName}}!", "switchQuestion": "Quer trocar\nde {{pokemonName}}?", "trainerDefeated": "Você derrotou\n{{trainerName}}!", "pokemonCaught": "{{pokemonName}} foi capturado!", diff --git a/src/locales/pt_BR/berry.ts b/src/locales/pt_BR/berry.ts new file mode 100644 index 00000000000..c5a9d882530 --- /dev/null +++ b/src/locales/pt_BR/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "Fruta Sitrus", + effect: "Restaura 25% dos PS se os PS estiverem abaixo de 50%", + }, + "LUM": { + name: "Fruta Lum", + effect: "Cura qualquer mudança de estado ou confusão", + }, + "ENIGMA": { + name: "Fruta Enigma", + effect: "Restaura 25% dos PS se atingido por um golpe supereficaz", + }, + "LIECHI": { + name: "Fruta Liechi", + effect: "Aumenta o Ataque se os PS estiverem abaixo de 25%", + }, + "GANLON": { + name: "Fruta Ganlon", + effect: "Aumenta a Defesa se os PS estiverem abaixo de 25%", + }, + "PETAYA": { + name: "Fruta Petaya", + effect: "Aumenta o Ataque Especial se os PS estiverem abaixo de 25%", + }, + "APICOT": { + name: "Fruta Apicot", + effect: "Aumenta a Defesa Especial se os PS estiverem abaixo de 25%", + }, + "SALAC": { + name: "Fruta Salac", + effect: "Aumenta a Velocidade se os PS estiverem abaixo de 25%", + }, + "LANSAT": { + name: "Fruta Lansat", + effect: "Aumenta a chance de acerto crítico se os PS estiverem abaixo de 25%", + }, + "STARF": { + name: "Fruta Starf", + effect: "Aumenta drasticamente um atributo aleatório se os PS estiverem abaixo de 25%", + }, + "LEPPA": { + name: "Fruta Leppa", + effect: "Restaura 10 PP de um movimento se seus PP acabarem", + }, +} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/config.ts b/src/locales/pt_BR/config.ts index af714a36316..457fc4c125a 100644 --- a/src/locales/pt_BR/config.ts +++ b/src/locales/pt_BR/config.ts @@ -1,6 +1,8 @@ import { ability } from "./ability"; +import { abilityTriggers } from "./ability-trigger"; import { battle } from "./battle"; import { commandUiHandler } from "./command-ui-handler"; +import { egg } from "./egg"; import { fightUiHandler } from "./fight-ui-handler"; import { growth } from "./growth"; import { menu } from "./menu"; @@ -10,27 +12,37 @@ import { move } from "./move"; import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; import { weather } from "./weather"; +import { berry } from "./berry"; -export const ptBrConfig = { +export const ptBrConfig = { ability: ability, + abilityTriggers: abilityTriggers, battle: battle, commandUiHandler: commandUiHandler, + egg: egg, fightUiHandler: fightUiHandler, menuUiHandler: menuUiHandler, menu: menu, move: move, pokeball: pokeball, - pokemonStat: pokemonStat, + pokemonInfo: pokemonInfo, pokemon: pokemon, starterSelectUiHandler: starterSelectUiHandler, + titles: titles, + trainerClasses: trainerClasses, + trainerNames: trainerNames, tutorial: tutorial, + splashMessages: splashMessages, nature: nature, growth: growth, weather: weather, modifierType: modifierType, -} \ No newline at end of file + berry: berry, +} diff --git a/src/locales/pt_BR/egg.ts b/src/locales/pt_BR/egg.ts new file mode 100644 index 00000000000..1d38fd5c694 --- /dev/null +++ b/src/locales/pt_BR/egg.ts @@ -0,0 +1,21 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const egg: SimpleTranslationEntries = { + "egg": "Ovo", + "greatTier": "Raro", + "ultraTier": "Épico", + "masterTier": "Lendário", + "defaultTier": "Comum", + "hatchWavesMessageSoon": "Barulhos podem ser ouvidos vindo de dentro! Vai chocar em breve!", + "hatchWavesMessageClose": "Parece se mover ocasionalmente. Pode estar perto de chocar.", + "hatchWavesMessageNotClose": "O que vai nascer disso? Não parece estar perto de chocar.", + "hatchWavesMessageLongTime": "Parece que este ovo vai demorar bastante para chocar.", + "gachaTypeLegendary": "Chance de Lendário Aumentada", + "gachaTypeMove": "Chance de Movimento de Ovo Raro Aumentada", + "gachaTypeShiny": "Chance de Shiny Aumentada", + "selectMachine": "Escolha uma máquina.", + "notEnoughVouchers": "Você não tem vouchers suficientes!", + "tooManyEggs": "Você já tem muitos ovos!", + "pull": "Prêmio", + "pulls": "Prêmios" +} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/modifier-type.ts b/src/locales/pt_BR/modifier-type.ts index 043d7a705d5..faf10fbab2b 100644 --- a/src/locales/pt_BR/modifier-type.ts +++ b/src/locales/pt_BR/modifier-type.ts @@ -4,406 +4,384 @@ export const modifierType: ModifierTypeTranslationEntries = { ModifierType: { "AddPokeballModifierType": { name: "{{modifierCount}}x {{pokeballName}}", - description: "Receive {{pokeballName}} x{{modifierCount}} (Inventory: {{pokeballAmount}}) \nCatch Rate: {{catchRate}}", + description: "Ganhe x{{modifierCount}} {{pokeballName}} (Mochila: {{pokeballAmount}}) \nChance de captura: {{catchRate}}", }, "AddVoucherModifierType": { name: "{{modifierCount}}x {{voucherTypeName}}", - description: "Receive {{voucherTypeName}} x{{modifierCount}}", + description: "Ganhe x{{modifierCount}} {{voucherTypeName}}", }, "PokemonHeldItemModifierType": { extra: { - "inoperable": "{{pokemonName}} can't take\nthis item!", - "tooMany": "{{pokemonName}} has too many\nof this item!", + "inoperable": "{{pokemonName}} não pode\nsegurar esse item!", + "tooMany": "{{pokemonName}} tem muitos\nmuitos deste item!", } }, "PokemonHpRestoreModifierType": { - description: "Restores {{restorePoints}} HP or {{restorePercent}}% HP for one Pokémon, whichever is higher", + description: "Restaura {{restorePoints}} PS ou {{restorePercent}}% PS de um Pokémon, o que for maior", extra: { - "fully": "Fully restores HP for one Pokémon", - "fullyWithStatus": "Fully restores HP for one Pokémon and heals any status ailment", + "fully": "Restaura totalmente os PS de um Pokémon", + "fullyWithStatus": "Restaura totalmente os PS de um Pokémon e cura qualquer mudança de estado", } }, "PokemonReviveModifierType": { - description: "Revives one Pokémon and restores {{restorePercent}}% HP", + description: "Reanima um Pokémon e restaura {{restorePercent}}% PS", }, "PokemonStatusHealModifierType": { - description: "Heals any status ailment for one Pokémon", + description: "Cura uma mudança de estado de um Pokémon", }, "PokemonPpRestoreModifierType": { - description: "Restores {{restorePoints}} PP for one Pokémon move", + description: "Restaura {{restorePoints}} PP para um movimento de um Pokémon", extra: { - "fully": "Restores all PP for one Pokémon move", + "fully": "Restaura todos os PP para um movimento de um Pokémon", } }, "PokemonAllMovePpRestoreModifierType": { - description: "Restores {{restorePoints}} PP for all of one Pokémon's moves", + description: "Restaura {{restorePoints}} PP para todos os movimentos de um Pokémon", extra: { - "fully": "Restores all PP for all of one Pokémon's moves", + "fully": "Restaura todos os PP para todos os movimentos de um Pokémon", } }, "PokemonPpUpModifierType": { - description: "Permanently increases PP for one Pokémon move by {{upPoints}} for every 5 maximum PP (maximum 3)", + description: "Aumenta permanentemente os PP para o movimento de um Pokémon em {{upPoints}} para cada 5 PP máximos (máximo 3)", }, "PokemonNatureChangeModifierType": { - name: "{{natureName}} Mint", - description: "Changes a Pokémon's nature to {{natureName}} and permanently unlocks the nature for the starter.", + name: "Hortelã {{natureName}}", + description: "Muda a natureza de um Pokémon para {{natureName}} e a desbloqueia permanentemente para seu inicial", }, "DoubleBattleChanceBoosterModifierType": { - description: "Doubles the chance of an encounter being a double battle for {{battleCount}} battles", + description: "Dobra as chances de encontrar uma batalha em dupla por {{battleCount}} batalhas", }, "TempBattleStatBoosterModifierType": { - description: "Increases the {{tempBattleStatName}} of all party members by 1 stage for 5 battles", + description: "Aumenta o atributo de {{tempBattleStatName}} para todos os membros da equipe por 5 batalhas", }, "AttackTypeBoosterModifierType": { - description: "Increases the power of a Pokémon's {{moveType}}-type moves by 20%", + description: "Aumenta o poder dos ataques do tipo {{moveType}} de um Pokémon em 20%", }, "PokemonLevelIncrementModifierType": { - description: "Increases a Pokémon's level by 1", + description: "Aumenta em 1 o nível de um Pokémon", }, "AllPokemonLevelIncrementModifierType": { - description: "Increases all party members' level by 1", + description: "Aumenta em 1 os níveis de todos os Pokémon", }, "PokemonBaseStatBoosterModifierType": { - description: "Increases the holder's base {{statName}} by 10%. The higher your IVs, the higher the stack limit.", + description: "Aumenta o atributo base de {{statName}} em 10%. Quanto maior os IVs, maior o limite de aumento", }, "AllPokemonFullHpRestoreModifierType": { - description: "Restores 100% HP for all Pokémon", + description: "Restaura totalmente os PS de todos os Pokémon", }, "AllPokemonFullReviveModifierType": { - description: "Revives all fainted Pokémon, fully restoring HP", + description: "Reanima todos os Pokémon, restaurando totalmente seus PS", }, "MoneyRewardModifierType": { - description: "Grants a {{moneyMultiplier}} amount of money (₽{{moneyAmount}})", + description: "Garante uma quantidade {{moneyMultiplier}} de dinheiro (₽{{moneyAmount}})", extra: { - "small": "small", - "moderate": "moderate", - "large": "large", + "small": "pequena", + "moderate": "moderada", + "large": "grande", }, }, "ExpBoosterModifierType": { - description: "Increases gain of EXP. Points by {{boostPercent}}%", + description: "Aumenta o ganho de pontos de experiência em {{boostPercent}}%", }, "PokemonExpBoosterModifierType": { - description: "Increases the holder's gain of EXP. Points by {{boostPercent}}%", + description: "Aumenta o ganho de pontos de experiência de quem segura em {{boostPercent}}%", }, "PokemonFriendshipBoosterModifierType": { - description: "Increases friendship gain per victory by 50%", + description: "Aumenta o ganho de amizade por vitória em 50%", }, "PokemonMoveAccuracyBoosterModifierType": { - description: "Increases move accuracy by {{accuracyAmount}} (maximum 100)", + description: "Aumenta a precisão dos movimentos em {{accuracyAmount}} (máximo 100)", }, "PokemonMultiHitModifierType": { - description: "Attacks hit one additional time at the cost of a 60/75/82.5% power reduction per stack respectively", + description: "Ataques acertam uma vez adicional ao custo de uma redução de poder de 60/75/82.5% por item, respectivamente", }, "TmModifierType": { name: "TM{{moveId}} - {{moveName}}", - description: "Teach {{moveName}} to a Pokémon", + description: "Ensina {{moveName}} a um Pokémon", }, "EvolutionItemModifierType": { - description: "Causes certain Pokémon to evolve", + description: "Faz certos Pokémon evoluírem", }, "FormChangeItemModifierType": { - description: "Causes certain Pokémon to change form", + description: "Faz certos Pokémon mudarem de forma", }, "FusePokemonModifierType": { - description: "Combines two Pokémon (transfers Ability, splits base stats and types, shares move pool)", + description: "Combina dois Pokémon (transfere Habilidade, divide os atributos base e tipos, compartilha os movimentos)", }, "TerastallizeModifierType": { - name: "{{teraType}} Tera Shard", - description: "{{teraType}} Terastallizes the holder for up to 10 battles", + name: "{{teraType}} Fragmento Tera", + description: "{{teraType}} Terastaliza um Pokémon por até 10 batalhas", }, "ContactHeldItemTransferChanceModifierType": { - description: "Upon attacking, there is a {{chancePercent}}% chance the foe's held item will be stolen", + description: "Quando atacar, tem {{chancePercent}}% de chance de roubar um item do oponente", }, "TurnHeldItemTransferModifierType": { - description: "Every turn, the holder acquires one held item from the foe", + description: "Todo turno, o Pokémon ganha um item aleatório do oponente", }, "EnemyAttackStatusEffectChanceModifierType": { - description: "Adds a {{chancePercent}}% chance to inflict {{statusEffect}} with attack moves", + description: "Ganha {{chancePercent}}% de chance de infligir {{statusEffect}} com ataques", }, "EnemyEndureChanceModifierType": { - description: "Adds a {{chancePercent}}% chance of enduring a hit", + description: "Ganha {{chancePercent}}% de chance de sobreviver a um ataque que o faria desmaiar", }, - "RARE_CANDY": { name: "Rare Candy" }, - "RARER_CANDY": { name: "Rarer Candy" }, + "RARE_CANDY": { name: "Doce Raro" }, + "RARER_CANDY": { name: "Doce Raríssimo" }, - "MEGA_BRACELET": { name: "Mega Bracelet", description: "Mega Stones become available" }, - "DYNAMAX_BAND": { name: "Dynamax Band", description: "Max Mushrooms become available" }, - "TERA_ORB": { name: "Tera Orb", description: "Tera Shards become available" }, + "MEGA_BRACELET": { name: "Mega Bracelete", description: "Mega Stones become available" }, + "DYNAMAX_BAND": { name: "Bracelete Dynamax", description: "Max Mushrooms become available" }, + "TERA_ORB": { name: "Orbe Tera", description: "Fragmentos Tera ficam disponíveis" }, - "MAP": { name: "Map", description: "Allows you to choose your destination at a crossroads" }, + "MAP": { name: "Mapa", description: "Permite escolher a próxima rota" }, - "POTION": { name: "Potion" }, - "SUPER_POTION": { name: "Super Potion" }, - "HYPER_POTION": { name: "Hyper Potion" }, - "MAX_POTION": { name: "Max Potion" }, - "FULL_RESTORE": { name: "Full Restore" }, + "POTION": { name: "Poção" }, + "SUPER_POTION": { name: "Super Poção" }, + "HYPER_POTION": { name: "Hiper Poção" }, + "MAX_POTION": { name: "Poção Máxima" }, + "FULL_RESTORE": { name: "Restaurador" }, - "REVIVE": { name: "Revive" }, - "MAX_REVIVE": { name: "Max Revive" }, + "REVIVE": { name: "Reanimador" }, + "MAX_REVIVE": { name: "Reanimador Máximo" }, - "FULL_HEAL": { name: "Full Heal" }, + "FULL_HEAL": { name: "Cura Total" }, - "SACRED_ASH": { name: "Sacred Ash" }, + "SACRED_ASH": { name: "Cinza Sagrada" }, - "REVIVER_SEED": { name: "Reviver Seed", description: "Revives the holder for 1/2 HP upon fainting" }, + "REVIVER_SEED": { name: "Semente Reanimadora", description: "Após desmaiar, reanima com 50% de PS" }, - "ETHER": { name: "Ether" }, - "MAX_ETHER": { name: "Max Ether" }, + "ETHER": { name: "Éter" }, + "MAX_ETHER": { name: "Éter Máximo" }, "ELIXIR": { name: "Elixir" }, - "MAX_ELIXIR": { name: "Max Elixir" }, + "MAX_ELIXIR": { name: "Elixir Máximo" }, - "PP_UP": { name: "PP Up" }, - "PP_MAX": { name: "PP Max" }, + "PP_UP": { name: "Mais PP" }, + "PP_MAX": { name: "PP Máximo" }, - "LURE": { name: "Lure" }, - "SUPER_LURE": { name: "Super Lure" }, - "MAX_LURE": { name: "Max Lure" }, + "LURE": { name: "Incenso" }, + "SUPER_LURE": { name: "Super Incenso" }, + "MAX_LURE": { name: "Incenso Máximo" }, - "MEMORY_MUSHROOM": { name: "Memory Mushroom", description: "Recall one Pokémon's forgotten move" }, + "MEMORY_MUSHROOM": { name: "Cogumemória", description: "Relembra um movimento esquecido" }, - "EXP_SHARE": { name: "EXP. All", description: "Non-participants receive 20% of a single participant's EXP. Points" }, - "EXP_BALANCE": { name: "EXP. Balance", description: "Weighs EXP. Points received from battles towards lower-leveled party members" }, + "EXP_SHARE": { name: "Compart. de Exp.", description: "Distribui pontos de experiência para todos os membros da equipe" }, + "EXP_BALANCE": { name: "Balanceador de Exp.", description: "Distribui pontos de experiência principalmente para os Pokémon mais fracos" }, - "OVAL_CHARM": { name: "Oval Charm", description: "When multiple Pokémon participate in a battle, each gets an extra 10% of the total EXP" }, + "OVAL_CHARM": { name: "Amuleto Oval", description: "Quando vários Pokémon participam de uma batalha, cada um recebe 10% extra de pontos de experiência" }, - "EXP_CHARM": { name: "EXP. Charm" }, - "SUPER_EXP_CHARM": { name: "Super EXP. Charm" }, - "GOLDEN_EXP_CHARM": { name: "Golden EXP. Charm" }, + "EXP_CHARM": { name: "Amuleto de Exp." }, + "SUPER_EXP_CHARM": { name: "Super Amuleto de Exp." }, + "GOLDEN_EXP_CHARM": { name: "Amuleto de Exp. Dourado" }, - "LUCKY_EGG": { name: "Lucky Egg" }, - "GOLDEN_EGG": { name: "Golden Egg" }, + "LUCKY_EGG": { name: "Ovo da Sorte" }, + "GOLDEN_EGG": { name: "Ovo Dourado" }, - "SOOTHE_BELL": { name: "Soothe Bell" }, + "SOOTHE_BELL": { name: "Guizo" }, - "SOUL_DEW": { name: "Soul Dew", description: "Increases the influence of a Pokémon's nature on its stats by 10% (additive)" }, + "SOUL_DEW": { name: "Joia da Alma", description: "Aumenta a influência da natureza de um Pokémon em seus atributos em 10% (cumulativo)" }, - "NUGGET": { name: "Nugget" }, - "BIG_NUGGET": { name: "Big Nugget" }, - "RELIC_GOLD": { name: "Relic Gold" }, + "NUGGET": { name: "Pepita" }, + "BIG_NUGGET": { name: "Pepita Grande" }, + "RELIC_GOLD": { name: "Relíquia de Ouro" }, - "AMULET_COIN": { name: "Amulet Coin", description: "Increases money rewards by 20%" }, - "GOLDEN_PUNCH": { name: "Golden Punch", description: "Grants 50% of damage inflicted as money" }, - "COIN_CASE": { name: "Coin Case", description: "After every 10th battle, receive 10% of your money in interest" }, + "AMULET_COIN": { name: "Moeda Amuleto", description: "Aumenta a recompensa de dinheiro em 50%" }, + "GOLDEN_PUNCH": { name: "Soco Dourado", description: "Concede 50% do dano causado em dinheiro" }, + "COIN_CASE": { name: "Moedeira", description: "Após cada 10ª batalha, recebe 10% de seu dinheiro em juros" }, - "LOCK_CAPSULE": { name: "Lock Capsule", description: "Allows you to lock item rarities when rerolling items" }, + "LOCK_CAPSULE": { name: "Cápsula de Travamento", description: "Permite que você trave raridades de itens ao rolar novamente" }, - "GRIP_CLAW": { name: "Grip Claw" }, - "WIDE_LENS": { name: "Wide Lens" }, + "GRIP_CLAW": { name: "Garra-Aperto" }, + "WIDE_LENS": { name: "Lente Ampla" }, - "MULTI_LENS": { name: "Multi Lens" }, + "MULTI_LENS": { name: "Multi Lentes" }, - "HEALING_CHARM": { name: "Healing Charm", description: "Increases the effectiveness of HP restoring moves and items by 10% (excludes Revives)" }, - "CANDY_JAR": { name: "Candy Jar", description: "Increases the number of levels added by Rare Candy items by 1" }, + "HEALING_CHARM": { name: "Amuleto de Cura", description: "Aumenta a eficácia dos movimentos e itens que restauram PS em 10% (exceto Reanimador)" }, + "CANDY_JAR": { name: "Pote de Doces", description: "Aumenta o número de níveis adicionados pelo Doce Raro em 1" }, - "BERRY_POUCH": { name: "Berry Pouch", description: "Adds a 25% chance that a used berry will not be consumed" }, + "BERRY_POUCH": { name: "Bolsa de Berries", description: "Adiciona uma chance de 25% de que uma berry usada não seja consumida" }, - "FOCUS_BAND": { name: "Focus Band", description: "Adds a 10% chance to survive with 1 HP after being damaged enough to faint" }, + "FOCUS_BAND": { name: "Bandana", description: "Adiciona uma chance de 10% de sobreviver com 1 PS após ser danificado o suficiente para desmaiar" }, - "QUICK_CLAW": { name: "Quick Claw", description: "Adds a 10% chance to move first regardless of speed (after priority)" }, + "QUICK_CLAW": { name: "Garra Rápida", description: "Adiciona uma chance de 10% de atacar primeiro, ignorando sua velocidade (após prioridades)" }, - "KINGS_ROCK": { name: "King's Rock", description: "Adds a 10% chance an attack move will cause the opponent to flinch" }, + "KINGS_ROCK": { name: "Pedra do Rei", description: "Adiciona uma chance de 10% de movimentos fazerem o oponente hesitar" }, - "LEFTOVERS": { name: "Leftovers", description: "Heals 1/16 of a Pokémon's maximum HP every turn" }, - "SHELL_BELL": { name: "Shell Bell", description: "Heals 1/8 of a Pokémon's dealt damage" }, + "LEFTOVERS": { name: "Sobras", description: "Cura 1/16 dos PS máximos de um Pokémon a cada turno" }, + "SHELL_BELL": { name: "Concha-Sino", description: "Cura 1/8 do dano causado por um Pokémon" }, - "BATON": { name: "Baton", description: "Allows passing along effects when switching Pokémon, which also bypasses traps" }, + "BATON": { name: "Bastão", description: "Permite passar mudanças de atributo ao trocar Pokémon, ignorando armadilhas" }, - "SHINY_CHARM": { name: "Shiny Charm", description: "Dramatically increases the chance of a wild Pokémon being Shiny" }, - "ABILITY_CHARM": { name: "Ability Charm", description: "Dramatically increases the chance of a wild Pokémon having a Hidden Ability" }, + "SHINY_CHARM": { name: "Amuleto Brilhante", description: "Aumenta drasticamente a chance de um Pokémon selvagem ser Shiny" }, + "ABILITY_CHARM": { name: "Amuleto de Habilidade", description: "Aumenta drasticamente a chance de um Pokémon selvagem ter uma Habilidade Oculta" }, - "IV_SCANNER": { name: "IV Scanner", description: "Allows scanning the IVs of wild Pokémon. 2 IVs are revealed per stack. The best IVs are shown first" }, + "IV_SCANNER": { name: "Scanner de IVs", description: "Permite escanear os IVs de Pokémon selvagens. 2 IVs são revelados por item. Os melhores IVs são mostrados primeiro" }, - "DNA_SPLICERS": { name: "DNA Splicers" }, + "DNA_SPLICERS": { name: "Splicer de DNA" }, - "MINI_BLACK_HOLE": { name: "Mini Black Hole" }, + "MINI_BLACK_HOLE": { name: "Mini Buraco Negro" }, - "GOLDEN_POKEBALL": { name: "Golden Poké Ball", description: "Adds 1 extra item option at the end of every battle" }, + "GOLDEN_POKEBALL": { name: "Poké Bola Dourada", description: "Adiciona 1 opção de item extra ao final de cada batalha" }, - "ENEMY_DAMAGE_BOOSTER": { name: "Damage Token", description: "Increases damage by 5%" }, - "ENEMY_DAMAGE_REDUCTION": { name: "Protection Token", description: "Reduces incoming damage by 2.5%" }, - "ENEMY_HEAL": { name: "Recovery Token", description: "Heals 2% of max HP every turn" }, - "ENEMY_ATTACK_POISON_CHANCE": { name: "Poison Token" }, - "ENEMY_ATTACK_PARALYZE_CHANCE": { name: "Paralyze Token" }, - "ENEMY_ATTACK_SLEEP_CHANCE": { name: "Sleep Token" }, - "ENEMY_ATTACK_FREEZE_CHANCE": { name: "Freeze Token" }, - "ENEMY_ATTACK_BURN_CHANCE": { name: "Burn Token" }, - "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { name: "Full Heal Token", description: "Adds a 10% chance every turn to heal a status condition" }, - "ENEMY_ENDURE_CHANCE": { name: "Endure Token" }, - "ENEMY_FUSED_CHANCE": { name: "Fusion Token", description: "Adds a 1% chance that a wild Pokémon will be a fusion" }, + "ENEMY_DAMAGE_BOOSTER": { name: "Token de Dano", description: "Aumenta o dano em 5%" }, + "ENEMY_DAMAGE_REDUCTION": { name: "Token de Proteção", description: "Reduz o dano recebido em 2,5%" }, + "ENEMY_HEAL": { name: "Token de Recuperação", description: "Cura 2% dos PS máximos a cada turno" }, + "ENEMY_ATTACK_POISON_CHANCE": { name: "Token de Veneno" }, + "ENEMY_ATTACK_PARALYZE_CHANCE": { name: "Token de Paralisia" }, + "ENEMY_ATTACK_SLEEP_CHANCE": { name: "Token de Sono" }, + "ENEMY_ATTACK_FREEZE_CHANCE": { name: "Token de Congelamento" }, + "ENEMY_ATTACK_BURN_CHANCE": { name: "Token de Queimadura" }, + "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { name: "Token de Cura Total", description: "Adiciona uma chance de 10% a cada turno de curar uma condição de status" }, + "ENEMY_ENDURE_CHANCE": { name: "Token de Persistência" }, + "ENEMY_FUSED_CHANCE": { name: "Token de Fusão", description: "Adiciona uma chance de 1% de que um Pokémon selvagem seja uma fusão" }, }, TempBattleStatBoosterItem: { - "x_attack": "X Attack", - "x_defense": "X Defense", - "x_sp_atk": "X Sp. Atk", - "x_sp_def": "X Sp. Def", - "x_speed": "X Speed", - "x_accuracy": "X Accuracy", - "dire_hit": "Dire Hit", + "x_attack": "Ataque X", + "x_defense": "Defesa X", + "x_sp_atk": "Ataque Esp. X", + "x_sp_def": "Defesa Esp. X", + "x_speed": "Velocidade X", + "x_accuracy": "Precisão X", + "dire_hit": "Direto", }, AttackTypeBoosterItem: { - "silk_scarf": "Silk Scarf", - "black_belt": "Black Belt", - "sharp_beak": "Sharp Beak", - "poison_barb": "Poison Barb", - "soft_sand": "Soft Sand", - "hard_stone": "Hard Stone", - "silver_powder": "Silver Powder", - "spell_tag": "Spell Tag", - "metal_coat": "Metal Coat", - "charcoal": "Charcoal", - "mystic_water": "Mystic Water", - "miracle_seed": "Miracle Seed", - "magnet": "Magnet", - "twisted_spoon": "Twisted Spoon", - "never_melt_ice": "Never-Melt Ice", - "dragon_fang": "Dragon Fang", - "black_glasses": "Black Glasses", - "fairy_feather": "Fairy Feather", + "silk_scarf": "Lenço de Seda", + "black_belt": "Faixa Preta", + "sharp_beak": "Bico Afiado", + "poison_barb": "Farpa Venenosa", + "soft_sand": "Areia Macia", + "hard_stone": "Pedra Dura", + "silver_powder": "Pó de Prata", + "spell_tag": "Talismã de Feitiço", + "metal_coat": "Revestimento Metálico", + "charcoal": "Carvão", + "mystic_water": "Água Mística", + "miracle_seed": "Semente Milagrosa", + "magnet": "Ímã", + "twisted_spoon": "Colher Torcida", + "never_melt_ice": "Gelo Eterno", + "dragon_fang": "Presa de Dragão", + "black_glasses": "Óculos Escuros", + "fairy_feather": "Pena de Fada", }, BaseStatBoosterItem: { - "hp_up": "HP Up", - "protein": "Protein", - "iron": "Iron", - "calcium": "Calcium", - "zinc": "Zinc", - "carbos": "Carbos", + "hp_up": "Mais PS", + "protein": "Proteína", + "iron": "Ferro", + "calcium": "Cálcio", + "zinc": "Zinco", + "carbos": "Carboidrato", }, EvolutionItem: { "NONE": "None", - "LINKING_CORD": "Linking Cord", - "SUN_STONE": "Sun Stone", - "MOON_STONE": "Moon Stone", - "LEAF_STONE": "Leaf Stone", - "FIRE_STONE": "Fire Stone", - "WATER_STONE": "Water Stone", - "THUNDER_STONE": "Thunder Stone", - "ICE_STONE": "Ice Stone", - "DUSK_STONE": "Dusk Stone", - "DAWN_STONE": "Dawn Stone", - "SHINY_STONE": "Shiny Stone", - "CRACKED_POT": "Cracked Pot", - "SWEET_APPLE": "Sweet Apple", - "TART_APPLE": "Tart Apple", - "STRAWBERRY_SWEET": "Strawberry Sweet", - "UNREMARKABLE_TEACUP": "Unremarkable Teacup", + "LINKING_CORD": "Cabo de Conexão", + "SUN_STONE": "Pedra do Sol", + "MOON_STONE": "Pedra da Lua", + "LEAF_STONE": "Pedra da Folha", + "FIRE_STONE": "Pedra do Fogo", + "WATER_STONE": "Pedra da Água", + "THUNDER_STONE": "Pedra do Trovão", + "ICE_STONE": "Pedra do Gelo", + "DUSK_STONE": "Pedra do Crepúsculo", + "DAWN_STONE": "Pedra da Alvorada", + "SHINY_STONE": "Pedra Brilhante", + "CRACKED_POT": "Vaso Quebrado", + "SWEET_APPLE": "Maçã Doce", + "TART_APPLE": "Maçã Azeda", + "STRAWBERRY_SWEET": "Doce de Morango", + "UNREMARKABLE_TEACUP": "Xícara Comum", - "CHIPPED_POT": "Chipped Pot", - "BLACK_AUGURITE": "Black Augurite", - "GALARICA_CUFF": "Galarica Cuff", - "GALARICA_WREATH": "Galarica Wreath", - "PEAT_BLOCK": "Peat Block", - "AUSPICIOUS_ARMOR": "Auspicious Armor", - "MALICIOUS_ARMOR": "Malicious Armor", - "MASTERPIECE_TEACUP": "Masterpiece Teacup", - "METAL_ALLOY": "Metal Alloy", - "SCROLL_OF_DARKNESS": "Scroll Of Darkness", - "SCROLL_OF_WATERS": "Scroll Of Waters", - "SYRUPY_APPLE": "Syrupy Apple", + "CHIPPED_POT": "Pote Lascado", + "BLACK_AUGURITE": "Mineral Negro", + "GALARICA_CUFF": "Bracelete de Galar", + "GALARICA_WREATH": "Coroa de Galar", + "PEAT_BLOCK": "Bloco de Turfa", + "AUSPICIOUS_ARMOR": "Armadura Prometida", + "MALICIOUS_ARMOR": "Armadura Maldita", + "MASTERPIECE_TEACUP": "Xícara Excepcional", + "METAL_ALLOY": "Liga de Metal", + "SCROLL_OF_DARKNESS": "Pergaminho da Escuridão", + "SCROLL_OF_WATERS": "Pergaminho da Água", + "SYRUPY_APPLE": "Xarope de Maçã", }, FormChangeItem: { "NONE": "None", - "ABOMASITE": "Abomasite", - "ABSOLITE": "Absolite", - "AERODACTYLITE": "Aerodactylite", - "AGGRONITE": "Aggronite", - "ALAKAZITE": "Alakazite", - "ALTARIANITE": "Altarianite", - "AMPHAROSITE": "Ampharosite", - "AUDINITE": "Audinite", - "BANETTITE": "Banettite", - "BEEDRILLITE": "Beedrillite", - "BLASTOISINITE": "Blastoisinite", - "BLAZIKENITE": "Blazikenite", - "CAMERUPTITE": "Cameruptite", - "CHARIZARDITE_X": "Charizardite X", - "CHARIZARDITE_Y": "Charizardite Y", - "DIANCITE": "Diancite", - "GALLADITE": "Galladite", - "GARCHOMPITE": "Garchompite", - "GARDEVOIRITE": "Gardevoirite", - "GENGARITE": "Gengarite", - "GLALITITE": "Glalitite", - "GYARADOSITE": "Gyaradosite", - "HERACRONITE": "Heracronite", - "HOUNDOOMINITE": "Houndoominite", - "KANGASKHANITE": "Kangaskhanite", - "LATIASITE": "Latiasite", - "LATIOSITE": "Latiosite", - "LOPUNNITE": "Lopunnite", - "LUCARIONITE": "Lucarionite", - "MANECTITE": "Manectite", - "MAWILITE": "Mawilite", - "MEDICHAMITE": "Medichamite", - "METAGROSSITE": "Metagrossite", - "MEWTWONITE_X": "Mewtwonite X", - "MEWTWONITE_Y": "Mewtwonite Y", - "PIDGEOTITE": "Pidgeotite", - "PINSIRITE": "Pinsirite", - "RAYQUAZITE": "Rayquazite", - "SABLENITE": "Sablenite", - "SALAMENCITE": "Salamencite", - "SCEPTILITE": "Sceptilite", - "SCIZORITE": "Scizorite", - "SHARPEDONITE": "Sharpedonite", - "SLOWBRONITE": "Slowbronite", - "STEELIXITE": "Steelixite", - "SWAMPERTITE": "Swampertite", - "TYRANITARITE": "Tyranitarite", - "VENUSAURITE": "Venusaurite", + "ABOMASITE": "Abomasita", + "ABSOLITE": "Absolita", + "AERODACTYLITE": "Aerodactylita", + "AGGRONITE": "Aggronita", + "ALAKAZITE": "Alakazita", + "ALTARIANITE": "Altarianita", + "AMPHAROSITE": "Ampharosita", + "AUDINITE": "Audinita", + "BANETTITE": "Banettita", + "BEEDRILLITE": "Beedrillita", + "BLASTOISINITE": "Blastoisinita", + "BLAZIKENITE": "Blazikenita", + "CAMERUPTITE": "Cameruptita", + "CHARIZARDITE X": "Charizardita X", + "CHARIZARDITE Y": "Charizardita Y", + "DIANCITE": "Diancita", + "GALLADITE": "Galladita", + "GARCHOMPITE": "Garchompita", + "GARDEVOIRITE": "Gardevoirita", + "GENGARITE": "Gengarita", + "GLALITITE": "Glalitita", + "GYARADOSITE": "Gyaradosita", + "HERACRONITE": "Heracronita", + "HOUNDOOMINITE": "Houndoominita", + "KANGASKHANITE": "Kangaskhanita", + "LATIASITE": "Latiasita", + "LATIOSITE": "Latiosita", + "LOPUNNITE": "Lopunnita", + "LUCARIONITE": "Lucarionita", + "MANECTITE": "Manectita", + "MAWILITE": "Mawilita", + "MEDICHAMITE": "Medichamita", + "METAGROSSITE": "Metagrossita", + "MEWTWONITE X": "Mewtwonita X", + "MEWTWONITE Y": "Mewtwonita Y", + "PIDGEOTITE": "Pidgeotita", + "PINSIRITE": "Pinsirita", + "SABLENITE": "Sablenita", + "RAYQUAZITE": "Rayquazita", + "SALAMENCITE": "Salamencita", + "SCEPTILITE": "Sceptilita", + "SCIZORITE": "Scizorita", + "SHARPEDONITE": "Sharpedonita", + "SLOWBRONITE": "Slowbronita", + "STEELIXITE": "Steelixita", + "SWAMPERTITE": "Swampertita", + "TYRANITARITE": "Tyranitarita", + "VENUSAURITE": "Venusaurita", - "BLUE_ORB": "Blue Orb", - "RED_ORB": "Red Orb", - "SHARP_METEORITE": "Sharp Meteorite", - "HARD_METEORITE": "Hard Meteorite", - "SMOOTH_METEORITE": "Smooth Meteorite", - "ADAMANT_CRYSTAL": "Adamant Crystal", - "LUSTROUS_ORB": "Lustrous Orb", - "GRISEOUS_CORE": "Griseous Core", - "REVEAL_GLASS": "Reveal Glass", - "GRACIDEA": "Gracidea", - "MAX_MUSHROOMS": "Max Mushrooms", - "DARK_STONE": "Dark Stone", - "LIGHT_STONE": "Light Stone", - "PRISON_BOTTLE": "Prison Bottle", - "N_LUNARIZER": "N Lunarizer", - "N_SOLARIZER": "N Solarizer", - "RUSTED_SWORD": "Rusted Sword", - "RUSTED_SHIELD": "Rusted Shield", - "ICY_REINS_OF_UNITY": "Icy Reins Of Unity", - "SHADOW_REINS_OF_UNITY": "Shadow Reins Of Unity", - "WELLSPRING_MASK": "Wellspring Mask", - "HEARTHFLAME_MASK": "Hearthflame Mask", - "CORNERSTONE_MASK": "Cornerstone Mask", - "SHOCK_DRIVE": "Shock Drive", - "BURN_DRIVE": "Burn Drive", - "CHILL_DRIVE": "Chill Drive", - "DOUSE_DRIVE": "Douse Drive", - }, - TeraType: { - "UNKNOWN": "Unknown", - "NORMAL": "Normal", - "FIGHTING": "Fighting", - "FLYING": "Flying", - "POISON": "Poison", - "GROUND": "Ground", - "ROCK": "Rock", - "BUG": "Bug", - "GHOST": "Ghost", - "STEEL": "Steel", - "FIRE": "Fire", - "WATER": "Water", - "GRASS": "Grass", - "ELECTRIC": "Electric", - "PSYCHIC": "Psychic", - "ICE": "Ice", - "DRAGON": "Dragon", - "DARK": "Dark", - "FAIRY": "Fairy", - "STELLAR": "Stellar", + "BLUE_ORB": "Orbe Azul", + "RED_ORB": "Orbe Vermelha", + "SHARP_METEORITE": "Meteorito Afiado", + "HARD_METEORITE": "Meteorito Duro", + "SMOOTH_METEORITE": " Meteorito Liso", + "ADAMANT_CRYSTAL": "Cristal Adamante", + "LUSTROUS_ORB": "Orbe Pérola", + "GRISEOUS_CORE": "Núcleo Platinado", + "REVEAL_GLASS": "Espelho da Verdade", + "GRACIDEA": "Gracídea", + "MAX_MUSHROOMS": "Cogumax", + "DARK_STONE": "Pedra das Trevas", + "LIGHT_STONE": "Pedra da Luz", + "PRISON_BOTTLE": "Garrafa Prisão", + "N_LUNARIZER": "Lunarizador N", + "N_SOLARIZER": "Solarizador N", + "RUSTED_SWORD": "Espada Enferrujada", + "RUSTED_SHIELD": "Escudo Enferrujado", + "ICY_REINS_OF_UNITY": "Rédeas de Gelo da União", + "SHADOW_REINS_OF_UNITY": "Rédeas Sombrias da União", + "WELLSPRING_MASK": "Máscara Nascente", + "HEARTHFLAME_MASK": "Máscara Fornalha", + "CORNERSTONE_MASK": "Máscara Alicerce", + "SHOCK_DRIVE": "MagneDisco", + "BURN_DRIVE": "IgneDisco", + "CHILL_DRIVE": "CrioDisco", + "DOUSE_DRIVE": "HidroDisco", }, } as const; \ No newline at end of file diff --git a/src/locales/pt_BR/move.ts b/src/locales/pt_BR/move.ts index 97f24efee37..ce55b5264ec 100644 --- a/src/locales/pt_BR/move.ts +++ b/src/locales/pt_BR/move.ts @@ -3583,7 +3583,7 @@ export const move: MoveTranslationEntries = { }, "revivalBlessing": { name: "Revival Blessing", - effect: "O usuário concede uma bênção amorosa, revivendo um Pokémon da equipe que tenha desmaiado e restaurando metade do máximo de PS desse Pokémon." + effect: "O usuário concede uma bênção amorosa, reanimando um Pokémon da equipe que tenha desmaiado e restaurando metade do máximo de PS desse Pokémon." }, "saltCure": { name: "Salt Cure", diff --git a/src/locales/pt_BR/pokeball.ts b/src/locales/pt_BR/pokeball.ts index 26624d87134..75d81ebde03 100644 --- a/src/locales/pt_BR/pokeball.ts +++ b/src/locales/pt_BR/pokeball.ts @@ -4,7 +4,7 @@ export const pokeball: SimpleTranslationEntries = { "pokeBall": "Poké Bola", "greatBall": "Grande Bola", "ultraBall": "Ultra Bola", - "rogueBall": "Rogue Bola", - "masterBall": "Master Bola", - "luxuryBall": "Bola de Luxo", + "rogueBall": "Bola Rogue", + "masterBall": "Bola Mestra", + "luxuryBall": "Bola Luxo", } as const; \ No newline at end of file diff --git a/src/locales/pt_BR/pokemon-info.ts b/src/locales/pt_BR/pokemon-info.ts new file mode 100644 index 00000000000..99cef266c6f --- /dev/null +++ b/src/locales/pt_BR/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "PS", + "HPshortened": "PS", + "ATK": "Ataque", + "ATKshortened": "Ata", + "DEF": "Defesa", + "DEFshortened": "Def", + "SPATK": "At. Esp.", + "SPATKshortened": "AtEsp", + "SPDEF": "Def. Esp.", + "SPDEFshortened": "DefEsp", + "SPD": "Veloc.", + "SPDshortened": "Veloc." + }, + + Type: { + "UNKNOWN": "Desconhecido", + "NORMAL": "Normal", + "FIGHTING": "Lutador", + "FLYING": "Voador", + "POISON": "Veneno", + "GROUND": "Terra", + "ROCK": "Pedra", + "BUG": "Inseto", + "GHOST": "Fantasma", + "STEEL": "Aço", + "FIRE": "Fogo", + "WATER": "Água", + "GRASS": "Grama", + "ELECTRIC": "Elétrico", + "PSYCHIC": "Psíquico", + "ICE": "Gelo", + "DRAGON": "Dragão", + "DARK": "Sombrio", + "FAIRY": "Fada", + "STELLAR": "Estelar" + }, +} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/pokemon-stat.ts b/src/locales/pt_BR/pokemon-stat.ts deleted file mode 100644 index 5f5e2c23584..00000000000 --- a/src/locales/pt_BR/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "PS", - "HPshortened": "PS", - "ATK": "Ataque", - "ATKshortened": "Ata", - "DEF": "Defesa", - "DEFshortened": "Def", - "SPATK": "At. Esp.", - "SPATKshortened": "AtEsp", - "SPDEF": "Def. Esp.", - "SPDEFshortened": "DefEsp", - "SPD": "Veloc.", - "SPDshortened": "Veloc." -} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/splash-messages.ts b/src/locales/pt_BR/splash-messages.ts new file mode 100644 index 00000000000..85c11300a9f --- /dev/null +++ b/src/locales/pt_BR/splash-messages.ts @@ -0,0 +1,37 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const splashMessages: SimpleTranslationEntries = { + "battlesWon": "Batalhas Ganhas!", + "joinTheDiscord": "Junte-se ao Discord!", + "infiniteLevels": "Níveis Infinitos!", + "everythingStacks": "Tudo Acumula!", + "optionalSaveScumming": "Você Pode Dar F5!", + "biomes": "35 Biomas!", + "openSource": "Código Aberto!", + "playWithSpeed": "Jogue na Velocidade 5x!", + "liveBugTesting": "Testamos os Bugs Ao Vivo!", + "heavyInfluence": "Grande Influência de RoR2!", + "pokemonRiskAndPokemonRain": "Pokémon Risk e Pokémon Rain!", + "nowWithMoreSalt": "O Choro é Livre!", + "infiniteFusionAtHome": "Infinite Fusion da Shopee!", + "brokenEggMoves": "Mov. de Ovo Apelões!", + "magnificent": "Magnífico!", + "mubstitute": "Mubstituto!", + "thatsCrazy": "Que Doidera!", + "oranceJuice": "Suco de Laranja!", + "questionableBalancing": "Balanceamento Questionável!", + "coolShaders": "Shader Maneiros!", + "aiFree": "Livre de IA!", + "suddenDifficultySpikes": "Ficou Difícil do Nada!", + "basedOnAnUnfinishedFlashGame": "Baseado num Jogo Online Inacabado!", + "moreAddictiveThanIntended": "Mais Viciante do que Planejado!", + "mostlyConsistentSeeds": "Consistente (na Maioria das Vezes)!", + "achievementPointsDontDoAnything": "Pontos de Conquista Não Fazem Nada!", + "youDoNotStartAtLevel": "Você Não Começa no Nível 2000!", + "dontTalkAboutTheManaphyEggIncident": "Não Fale do Incidente do Ovo de Manaphy!", + "alsoTryPokengine": "Também Jogue Pokéngine!", + "alsoTryEmeraldRogue": "Também Jogue Emerald Rogue!", + "alsoTryRadicalRed": "Também Jogue Radical Red!", + "eeveeExpo": "Eevee Expo!", + "ynoproject": "YNOproject!", +} as const; \ No newline at end of file diff --git a/src/locales/pt_BR/trainers.ts b/src/locales/pt_BR/trainers.ts index 9bc952ad833..bc79f98b41b 100644 --- a/src/locales/pt_BR/trainers.ts +++ b/src/locales/pt_BR/trainers.ts @@ -16,27 +16,29 @@ export const titles: SimpleTranslationEntries = { export const trainerClasses: SimpleTranslationEntries = { "ace_trainer": "Trinador Ás", "ace_trainer_female": "Trinadora Ás", - "ace_duo": "Ace Duo", + "ace_duo": "Dupla Ás", "artist": "Artista", "artist_female": "Artista", - "backpackers": "Backpackers", + "backpackers": "Mochileiros", "backers": "Torcedores", "backpacker": "Mochileiro", "backpacker_female": "Mochileira", "baker": "Padeira", "battle_girl": "Lutadora", "beauty": "Modelo", + "beginners": "Beginners", "biker": "Motoqueiro", "black_belt": "Faixa Preta", "breeder": "Criador", "breeder_female": "Criadora", - "breeders": "Breeders", + "breeders": "Criadores", "clerk": "Funcionário", "clerk_female": "Funcionária", - "colleagues": "Colleagues", + "colleagues": "Funcionários", + "crush_kin": "Casal Lutador", "cyclist": "Ciclista", "cyclist_female": "Ciclista", - "cyclists": "Cyclists", + "cyclists": "Ciclistas", "dancer": "Dançarino", "dancer_female": "Dançarina", "depot_agent": "Ferroviário", @@ -44,22 +46,22 @@ export const trainerClasses: SimpleTranslationEntries = { "doctor_female": "Doutora", "fishermen": "Pescador", "fishermen_female": "Pescadora", - "gentleman": "Gentleman", + "gentleman": "Cavalheiro", "guitarist": "Guitarrista", "guitarist_female": "Guitarrista", "harlequin": "Arlequim", "hiker": "Montanhista", "hooligans": "Bandoleiro", - "hoopster": "Jogador de basquete", - "infielder": "Jogador de baseball", + "hoopster": "Jogador de Basquete", + "infielder": "Jogador de Baseball", "janitor": "Faxineiro", "lady": "Dama", "lass": "Senhorita", "linebacker": "Zagueiro", "maid": "Doméstica", "madame": "Madame", - "musican": "Músico", - "medical_team": "Medical Team", + "medical_team": "Equipe Médica", + "musician": "Músico", "hex_maniac": "Ocultista", "nurse": "Enfermeira", "nursery_aide": "Professora do Berçário", @@ -67,42 +69,47 @@ export const trainerClasses: SimpleTranslationEntries = { "parasol_lady": "Moça de Sombrinha", "pilot": "Piloto", "poké_fan": "Pokefã", - "poké_fan_family": "Poké Fan Family", + "poké_fan_family": "Família Pokefã", "preschooler": "Menino do Prezinho", "preschooler_female": "Menina do Prezinho", - "preschoolers": "Preschoolers", + "preschoolers": "Alunos do Prezinho", "psychic": "Médium", "psychic_female": "Médium", - "psychics": "Psychics", - "pokémon_ranger": "Pokémon Ranger", - "pokémon_rangers": "Pokémon Ranger", + "psychics": "Médiuns", + "pokémon_ranger": "Guarda Pokémon", + "pokémon_rangers": "Guardas Pokémon", "ranger": "Guarda", - "restaurant_staff": "Restaurant Staff", - "rich_boy": "Rich Boy", - "rich_couple": "Rich Couple", - "rich_kids": "Rich Kids", + "restaurant_staff": "Equipe do Restaurante", + "rich": "Burguês", + "rich_female": "Burguesa", + "rich_boy": "Riquinho", + "rich_couple": "Casal Burguês", + "rich_kid": "Garoto Rico", + "rich_kid_female": "Garota Rica", + "rich_kids": "Garotos Ricos", "roughneck": "Arruaceiro", "scientist": "Cientista", "scientist_female": "Cientista", - "scientists": "Scientists", + "scientists": "Cientistas", "smasher": "Tenista", "snow_worker": "Operário da Neve", "snow_worker_female": "Operária da Neve", "striker": "Atacante", "school_kid": "Estudante", "school_kid_female": "Estudante", - "school_kids": "School Kids", + "school_kids": "Estudantes", "swimmer": "Nadador", "swimmer_female": "Nadadora", - "swimmers": "Swimmers", + "swimmers": "Nadadores", "twins": "Gêmeos", "veteran": "Veterano", "veteran_female": "Veterana", - "veteran_duo": "Veteran Duo", + "veteran_duo": "Dupla Veterana", "waiter": "Garçom", "waitress": "Garçonete", "worker": "Operário", "worker_female": "Operária", + "workers": "Operários", "youngster": "Jovem", } as const; @@ -212,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = { "kahili": "Kahili", "rika": "Rika", "poppy": "Poppy", - "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "hassel": "Hassel", "crispin": "Crispin", "amarys": "Amarys", @@ -220,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = { "drayton": "Drayton", "blue": "Blue", "red": "Red", - "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) "steven": "Steven", "wallace": "Wallace", "cynthia": "Cynthia", diff --git a/src/locales/zh_CN/battle-message-ui-handler.ts b/src/locales/zh_CN/battle-message-ui-handler.ts new file mode 100644 index 00000000000..843a8886093 --- /dev/null +++ b/src/locales/zh_CN/battle-message-ui-handler.ts @@ -0,0 +1,10 @@ +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const battleMessageUiHandler: SimpleTranslationEntries = { + "ivBest": "最棒", + "ivFantastic": "了不起", + "ivVeryGood": "非常好", + "ivPrettyGood": "相当好", + "ivDecent": "一般般", + "ivNoGood": "也许不行", +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts index f99e2ddc76a..f698fcc32ab 100644 --- a/src/locales/zh_CN/battle.ts +++ b/src/locales/zh_CN/battle.ts @@ -2,22 +2,23 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} 出现了。", - "trainerAppeared": "{{trainerName}}\n想要和你对战!", - "singleWildAppeared": "一只野生 {{pokemonName}} 出现了。!", - "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了。!", - "playerComeBack": "回来吧, {{pokemonName}}!", - "trainerComeBack": "{{trainerName}} 收回了 {{pokemonName}}!", - "playerGo": "去吧! {{pokemonName}}!", - "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}!", - "switchQuestion": "要更换\n{{pokemonName}}吗?", - "trainerDefeated": `你击败了\n{{trainerName}}!`, - "pokemonCaught": "{{pokemonName}} 被抓住了!", + "trainerAppeared": "{{trainerName}}\n想要和你对战！", + "trainerAppearedDouble": "{{trainerName}}\n想要和你对战！", + "singleWildAppeared": "一只野生 {{pokemonName}} 出现了！", + "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了！", + "playerComeBack": "回来吧, {{pokemonName}}！", + "trainerComeBack": "{{trainerName}} 收回了 {{pokemonName}}！", + "playerGo": "去吧！ {{pokemonName}}！", + "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}！", + "switchQuestion": "要更换\n{{pokemonName}}吗？", + "trainerDefeated": `你击败了\n{{trainerName}}！`, + "pokemonCaught": "{{pokemonName}} 被抓住了！", "pokemon": "宝可梦", - "sendOutPokemon": "上吧！ {{pokemonName}}!", + "sendOutPokemon": "上吧！ {{pokemonName}}！", "hitResultCriticalHit": "击中了要害！", "hitResultSuperEffective": "效果拔群！", "hitResultNotVeryEffective": "收效甚微…", - "hitResultNoEffect": "对 {{pokemonName}} 没有效果！!", + "hitResultNoEffect": "对 {{pokemonName}} 没有效果！！", "hitResultOneHitKO": "一击必杀！", "attackFailed": "但是失败了！", "attackHitsCount": `击中 {{count}} 次！`, @@ -31,7 +32,7 @@ export const battle: SimpleTranslationEntries = { "learnMoveNotLearned": "{{pokemonName}} 没有学会 {{moveName}}。", "learnMoveForgetQuestion": "要忘记哪个技能？", "learnMoveForgetSuccess": "{{pokemonName}} 忘记了\n如何使用 {{moveName}}。", - "countdownPoof": "@d{32}1, @d{15}2, @d{15}和@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}噗!", + "countdownPoof": "@d{32}1, @d{15}2, @d{15}和@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}噗！", "learnMoveAnd": "然后...", "levelCapUp": "等级上限提升到 {{levelCap}}！", "moveNotImplemented": "{{moveName}} 尚未实装，无法选择。", diff --git a/src/locales/zh_CN/berry.ts b/src/locales/zh_CN/berry.ts new file mode 100644 index 00000000000..08b16d58e68 --- /dev/null +++ b/src/locales/zh_CN/berry.ts @@ -0,0 +1,48 @@ +import { BerryTranslationEntries } from "#app/plugins/i18n"; + +export const berry: BerryTranslationEntries = { + "SITRUS": { + name: "文柚果", + effect: "HP低于50%时，回复最大HP的25%", + }, + "LUM": { + name: "木子果", + effect: "治愈任何异常状态和混乱状态", + }, + "ENIGMA": { + name: "谜芝果", + effect: "受到效果绝佳的招式攻击时，回复25%最大HP", + }, + "LIECHI": { + name: "枝荔果", + effect: "HP低于25%时，攻击提升一个等级", + }, + "GANLON": { + name: "龙睛果", + effect: "HP低于25%时，防御提升一个等级", + }, + "PETAYA": { + name: "龙火果", + effect: "HP低于25%时，特攻提升一个等级", + }, + "APICOT": { + name: "杏仔果", + effect: "HP低于25%时，特防提升一个等级", + }, + "SALAC": { + name: "沙鳞果", + effect: "HP低于25%时，速度提升一个等级", + }, + "LANSAT": { + name: "兰萨果", + effect: "HP低于25%时，击中要害率提升两个等级", + }, + "STARF": { + name: "星桃果", + effect: "HP低于25%时，提高随机一项能力两个等级", + }, + "LEPPA": { + name: "苹野果", + effect: "有招式的PP降到0时，恢复该招式10PP", + }, +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/command-ui-handler.ts b/src/locales/zh_CN/command-ui-handler.ts index 50f94864cc2..3c17efffd8a 100644 --- a/src/locales/zh_CN/command-ui-handler.ts +++ b/src/locales/zh_CN/command-ui-handler.ts @@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = { "ball": "精灵球", "pokemon": "宝可梦", "run": "逃跑", - "actionMessage": "要让\n{{pokemonName}} 做什么?", + "actionMessage": "要让\n{{pokemonName}} 做什么？", } as const; \ No newline at end of file diff --git a/src/locales/zh_CN/config.ts b/src/locales/zh_CN/config.ts index 957b1e7a482..10fe2bc884e 100644 --- a/src/locales/zh_CN/config.ts +++ b/src/locales/zh_CN/config.ts @@ -2,20 +2,24 @@ import { ability } from "./ability"; import { abilityTriggers } from "./ability-trigger"; import { battle } from "./battle"; import { commandUiHandler } from "./command-ui-handler"; +// import { egg } from "./egg"; import { fightUiHandler } from "./fight-ui-handler"; +import { growth } from "./growth"; import { menu } from "./menu"; import { menuUiHandler } from "./menu-ui-handler"; +import { modifierType } from "./modifier-type"; import { move } from "./move"; +import { nature } from "./nature"; import { pokeball } from "./pokeball"; import { pokemon } from "./pokemon"; -import { pokemonStat } from "./pokemon-stat"; +import { pokemonInfo } from "./pokemon-info"; +// import { splashMessages } from "./splash-messages"; import { starterSelectUiHandler } from "./starter-select-ui-handler"; +import { titles, trainerClasses, trainerNames } from "./trainers"; import { tutorial } from "./tutorial"; -import { titles,trainerClasses,trainerNames } from "./trainers"; -import { nature } from "./nature"; import { weather } from "./weather"; -import { modifierType } from "./modifier-type"; -import { growth } from "./growth"; +import { battleMessageUiHandler } from "./battle-message-ui-handler"; +import { berry } from "./berry"; export const zhCnConfig = { @@ -23,21 +27,24 @@ export const zhCnConfig = { abilityTriggers: abilityTriggers, battle: battle, commandUiHandler: commandUiHandler, + // egg: egg, fightUiHandler: fightUiHandler, - menuUiHandler: menuUiHandler, + growth: growth, menu: menu, + menuUiHandler: menuUiHandler, + modifierType: modifierType, move: move, - pokeball: pokeball, - pokemonStat: pokemonStat, - pokemon: pokemon, - starterSelectUiHandler: starterSelectUiHandler, nature: nature, + pokeball: pokeball, + pokemon: pokemon, + pokemonInfo: pokemonInfo, + // splashMessages: splashMessages, + starterSelectUiHandler: starterSelectUiHandler, titles: titles, trainerClasses: trainerClasses, trainerNames: trainerNames, tutorial: tutorial, - nature: nature, - growth: growth, weather: weather, - modifierType: modifierType, -} + battleMessageUiHandler: battleMessageUiHandler, + berry: berry, +} \ No newline at end of file diff --git a/src/locales/zh_CN/fight-ui-handler.ts b/src/locales/zh_CN/fight-ui-handler.ts index d86767bd13d..8287a4d80db 100644 --- a/src/locales/zh_CN/fight-ui-handler.ts +++ b/src/locales/zh_CN/fight-ui-handler.ts @@ -1,7 +1,7 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const fightUiHandler: SimpleTranslationEntries = { - "pp": "PP", - "power": "威力", - "accuracy": "命中率", +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const fightUiHandler: SimpleTranslationEntries = { + "pp": "PP", + "power": "威力", + "accuracy": "命中", } as const; \ No newline at end of file diff --git a/src/locales/zh_CN/growth.ts b/src/locales/zh_CN/growth.ts index daeeed63385..49d6b59a935 100644 --- a/src/locales/zh_CN/growth.ts +++ b/src/locales/zh_CN/growth.ts @@ -1,10 +1,10 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const growth: SimpleTranslationEntries = { - "Erratic": "最快", - "Fast": "快", - "Medium_Fast": "较快", - "Medium_Slow": "较慢", - "Slow": "慢", - "Fluctuating": "最慢" +import { SimpleTranslationEntries } from "#app/plugins/i18n"; + +export const growth: SimpleTranslationEntries = { + "Erratic": "最快", + "Fast": "较快", + "Medium_Fast": "快", + "Medium_Slow": "慢", + "Slow": "较慢", + "Fluctuating": "最慢" } as const; \ No newline at end of file diff --git a/src/locales/zh_CN/menu.ts b/src/locales/zh_CN/menu.ts index 14bba6f5e6e..c80f55eac61 100644 --- a/src/locales/zh_CN/menu.ts +++ b/src/locales/zh_CN/menu.ts @@ -35,11 +35,11 @@ export const menu: SimpleTranslationEntries = { "boyOrGirl": "你是男孩还是女孩？", "boy": "男孩", "girl": "女孩", - "evolving": "咦?\n{{pokemonName}} 开始进化了!", - "stoppedEvolving": "{{pokemonName}} 停止了进化.", - "pauseEvolutionsQuestion": "你确定要停止 {{pokemonName}} 的进化吗?\n你可以在队伍界面中重新进化.", - "evolutionsPaused": "{{pokemonName}} 的进化停止了.", - "evolutionDone": "恭喜!\n你的 {{pokemonName}} 进化成了 {{evolvedPokemonName}}!", + "evolving": "咦？\n{{pokemonName}} 开始进化了！", + "stoppedEvolving": "{{pokemonName}} 停止了进化。", + "pauseEvolutionsQuestion": "你确定要停止 {{pokemonName}} 的进化吗？\n你可以在队伍界面中重新进化。", + "evolutionsPaused": "{{pokemonName}} 的进化停止了。", + "evolutionDone": "恭喜！\n你的 {{pokemonName}} 进化成了 {{evolvedPokemonName}}！", "dailyRankings": "每日排名", "weeklyRankings": "每周排名", "noRankings": "无排名", diff --git a/src/locales/zh_CN/modifier-type.ts b/src/locales/zh_CN/modifier-type.ts index 80ddc1f92dd..e826c743fbc 100644 --- a/src/locales/zh_CN/modifier-type.ts +++ b/src/locales/zh_CN/modifier-type.ts @@ -20,7 +20,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "为一只宝可梦回复 {{restorePoints}} HP 或 {{restorePercent}}% HP，取最大值", extra: { "fully": "为一只宝可梦回复全部HP", - "fullyWithStatus": "为一只宝可梦回复全部HP并消除所有负面状态", + "fullyWithStatus": "为一只宝可梦回复全部HP并消除所有负面\n状态", } }, "PokemonReviveModifierType": { @@ -42,11 +42,11 @@ export const modifierType: ModifierTypeTranslationEntries = { } }, "PokemonPpUpModifierType": { - description: "为一只宝可梦的一个招式永久增加{{upPoints}}点PP每5点当前最大PP (最多3点)", + description: "为一只宝可梦的一个招式永久增加{{upPoints}}点\nPP每5点当前最大PP (最多3点)", }, "PokemonNatureChangeModifierType": { name: "{{natureName}}薄荷", - description: "将一只宝可梦的性格改为{{natureName}}并为该宝可梦永久解锁该性格.", + description: "将一只宝可梦的性格改为{{natureName}}并为该宝可\n梦永久解锁该性格.", }, "DoubleBattleChanceBoosterModifierType": { description: "接下来的{{battleCount}}场战斗是双打的概率翻倍", @@ -64,7 +64,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "所有成员宝可梦等级提升1级", }, "PokemonBaseStatBoosterModifierType": { - description: "增加持有者的{{statName}}10%. 个体值越高堆叠上限越高.", + description: "增加持有者的{{statName}}10%，个体值越高堆叠\n上限越高.", }, "AllPokemonFullHpRestoreModifierType": { description: "所有宝可梦完全回复HP", @@ -81,10 +81,10 @@ export const modifierType: ModifierTypeTranslationEntries = { }, }, "ExpBoosterModifierType": { - description: "EXP.获取量增加{{boostPercent}}%", + description: "经验值获取量增加{{boostPercent}}%", }, "PokemonExpBoosterModifierType": { - description: "持有者EXP.获取量增加{{boostPercent}}%", + description: "持有者经验值获取量增加{{boostPercent}}%", }, "PokemonFriendshipBoosterModifierType": { description: "每场战斗获得的好感度提升50%", @@ -93,7 +93,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "招式命中率增加{{accuracyAmount}} (最大100)", }, "PokemonMultiHitModifierType": { - description: "攻击造成一次额外伤害，每次堆叠额外伤害分别衰减60/75/82.5%", + description: "攻击造成一次额外伤害，每次堆叠额外伤害\n分别衰减60/75/82.5%", }, "TmModifierType": { name: "招式学习器 {{moveId}} - {{moveName}}", @@ -106,7 +106,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "使某些宝可梦更改形态", }, "FusePokemonModifierType": { - description: "融合两只宝可梦 (改变特性, 平分基础点数和属性, 共享招式池)", + description: "融合两只宝可梦 (改变特性, 平分基础点数\n和属性, 共享招式池)", }, "TerastallizeModifierType": { name: "{{teraType}}太晶碎块", @@ -128,9 +128,9 @@ export const modifierType: ModifierTypeTranslationEntries = { "RARE_CANDY": { name: "神奇糖果" }, "RARER_CANDY": { name: "超神奇糖果" }, - "MEGA_BRACELET": { name: "超级手镯", description: "能让携带着超级石战斗的宝可梦进行超级进化" }, - "DYNAMAX_BAND": { name: "极巨腕带", description: "能让携带着极巨菇菇战斗的宝可梦进行极巨化" }, - "TERA_ORB": { name: "太晶珠", description: "能让携带着太晶碎块战斗的宝可梦进行太晶化" }, + "MEGA_BRACELET": { name: "超级手镯", description: "能让携带着超级石战斗的宝可梦进行\n超级进化" }, + "DYNAMAX_BAND": { name: "极巨腕带", description: "能让携带着极巨菇菇战斗的宝可梦进行\n极巨化" }, + "TERA_ORB": { name: "太晶珠", description: "能让携带着太晶碎块战斗的宝可梦进行\n太晶化" }, "MAP": { name: "地图", description: "允许你在切换宝可梦群落时选择目的地"}, @@ -165,9 +165,9 @@ export const modifierType: ModifierTypeTranslationEntries = { "MEMORY_MUSHROOM": { name: "回忆蘑菇", description: "回忆一个宝可梦已经遗忘的招式" }, "EXP_SHARE": { name: "学习装置", description: "未参加对战的宝可梦获得20%的经验值" }, - "EXP_BALANCE": { name: "均衡型学习装置", description: "增加战斗中获得的EXP.分配给低级成员宝可梦的权重" }, + "EXP_BALANCE": { name: "均衡型学习装置", description: "队伍中的低级宝可梦获得更多经验值" }, - "OVAL_CHARM": { name: "圆形护符", description: "当多只宝可梦参与战斗, 分别获得总EXP.10%的额外EXP." }, + "OVAL_CHARM": { name: "圆形护符", description: "当多只宝可梦参与战斗，分别获得总经验值\n10%的额外经验值" }, "EXP_CHARM": { name: "经验护符" }, "SUPER_EXP_CHARM": { name: "超级经验护符" }, @@ -200,21 +200,21 @@ export const modifierType: ModifierTypeTranslationEntries = { "BERRY_POUCH": { name: "树果袋", description: "使用树果时有25%的几率不会消耗树果" }, - "FOCUS_BAND": { name: "气势头带", description: "携带该道具的宝可梦有10%几率在受到攻击而将陷入濒死状态时，保留1点HP不陷入濒死状态。" }, + "FOCUS_BAND": { name: "气势头带", description: "携带该道具的宝可梦有10%几率在受到\n攻击而将陷入濒死状态时，保留1点HP不陷入濒死状态" }, - "QUICK_CLAW": { name: "先制之爪", description: "有10%的几率无视速度优先使出招式 (先制技能优先)" }, + "QUICK_CLAW": { name: "先制之爪", description: "有10%的几率无视速度优先使出招式\n(先制技能优先)" }, - "KINGS_ROCK": { name: "王者之证", description: "携带该道具的宝可梦使用任意原本不会造成畏缩状态的攻击招式并造成伤害时，有10%几率使目标陷入畏缩状态。" }, + "KINGS_ROCK": { name: "王者之证", description: "携带该道具的宝可梦使用任意原本不会造成\n畏缩状态的攻击招式并造成伤害时，有\n10%几率使目标陷入畏缩状态" }, - "LEFTOVERS": { name: "吃剩的东西", description: "携带该道具的宝可梦在每个回合结束时恢复最大HP的1/16" }, - "SHELL_BELL": { name: "贝壳之铃", description: "携带该道具的宝可梦在攻击对方成功造成伤害时，携带者的HP会恢复其所造成伤害的1/8" }, + "LEFTOVERS": { name: "吃剩的东西", description: "携带该道具的宝可梦在每个回合结束时恢复\n最大HP的1/16" }, + "SHELL_BELL": { name: "贝壳之铃", description: "携带该道具的宝可梦在攻击对方成功造成伤\n害时，携带者的HP会恢复其所造成伤害\n的1/8" }, - "BATON": { name: "接力棒", description: "允许在切换宝可梦时保留能力变化, 对陷阱同样生效" }, + "BATON": { name: "接力棒", description: "允许在切换宝可梦时保留能力变化, 对陷阱\n同样生效" }, "SHINY_CHARM": { name: "闪耀护符", description: "显著增加野生宝可梦的闪光概率" }, "ABILITY_CHARM": { name: "特性护符", description: "显著增加野生宝可梦有隐藏特性的概率" }, - "IV_SCANNER": { name: "个体值探测器", description: "允许扫描野生宝可梦的个体值。 每个次显示2个个体值. 最好的个体值优先显示" }, + "IV_SCANNER": { name: "个体值探测器", description: "允许扫描野生宝可梦的个体值。 每个次显示\n2个个体值. 最好的个体值优先显示" }, "DNA_SPLICERS": { name: "基因之楔" }, @@ -384,26 +384,4 @@ export const modifierType: ModifierTypeTranslationEntries = { "CHILL_DRIVE": "冰冻卡带", "DOUSE_DRIVE": "水流卡带", }, - TeraType: { - "UNKNOWN": "Unknown", - "NORMAL": "一般", - "FIGHTING": "格斗", - "FLYING": "飞行", - "POISON": "毒", - "GROUND": "地面", - "ROCK": "岩石", - "BUG": "虫", - "GHOST": "幽灵", - "STEEL": "钢", - "FIRE": "火", - "WATER": "水", - "GRASS": "草", - "ELECTRIC": "电", - "PSYCHIC": "超能力", - "ICE": "冰", - "DRAGON": "龙", - "DARK": "恶", - "FAIRY": "妖精", - "STELLAR": "星晶", - }, } as const; \ No newline at end of file diff --git a/src/locales/zh_CN/pokemon-info.ts b/src/locales/zh_CN/pokemon-info.ts new file mode 100644 index 00000000000..09c843bb8c2 --- /dev/null +++ b/src/locales/zh_CN/pokemon-info.ts @@ -0,0 +1,41 @@ +import { PokemonInfoTranslationEntries } from "#app/plugins/i18n"; + +export const pokemonInfo: PokemonInfoTranslationEntries = { + Stat: { + "HP": "最大HP", + "HPshortened": "最大HP", + "ATK": "攻击", + "ATKshortened": "攻击", + "DEF": "防御", + "DEFshortened": "防御", + "SPATK": "特攻", + "SPATKshortened": "特攻", + "SPDEF": "特防", + "SPDEFshortened": "特防", + "SPD": "速度", + "SPDshortened": "速度" + }, + + Type: { + "UNKNOWN": "未知", + "NORMAL": "一般", + "FIGHTING": "格斗", + "FLYING": "飞行", + "POISON": "毒", + "GROUND": "地面", + "ROCK": "岩石", + "BUG": "虫", + "GHOST": "幽灵", + "STEEL": "钢", + "FIRE": "火", + "WATER": "水", + "GRASS": "草", + "ELECTRIC": "电", + "PSYCHIC": "超能力", + "ICE": "冰", + "DRAGON": "龙", + "DARK": "恶", + "FAIRY": "妖精", + "STELLAR": "星晶", + }, +} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/pokemon-stat.ts b/src/locales/zh_CN/pokemon-stat.ts deleted file mode 100644 index d30922c46a0..00000000000 --- a/src/locales/zh_CN/pokemon-stat.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { SimpleTranslationEntries } from "#app/plugins/i18n"; - -export const pokemonStat: SimpleTranslationEntries = { - "HP": "最大HP", - "HPshortened": "最大HP", - "ATK": "攻击", - "ATKshortened": "攻击", - "DEF": "防御", - "DEFshortened": "防御", - "SPATK": "特攻", - "SPATKshortened": "特攻", - "SPDEF": "特防", - "SPDEFshortened": "特防", - "SPD": "速度", - "SPDshortened": "速度" -} as const; \ No newline at end of file diff --git a/src/locales/zh_CN/trainers.ts b/src/locales/zh_CN/trainers.ts index c4acd85c44e..2dd10d49ef4 100644 --- a/src/locales/zh_CN/trainers.ts +++ b/src/locales/zh_CN/trainers.ts @@ -2,238 +2,297 @@ import {SimpleTranslationEntries} from "#app/plugins/i18n"; // Titles of special trainers like gym leaders, elite four, and the champion export const titles: SimpleTranslationEntries = { - "elite_four": "Elite Four", - "gym_leader": "Gym Leader", - "gym_leader_female": "Gym Leader", - "champion": "Champion", - "rival": "Rival", - "professor": "Professor", - "frontier_brain": "Frontier Brain", + "elite_four": "四天王", + "gym_leader": "道馆馆主", + "gym_leader_female": "道馆馆主", + "champion": "冠军", + "rival": "劲敌", + "professor": "博士", + "frontier_brain": "开拓头脑", // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc. } as const; // Titles of trainers like "Youngster" or "Lass" export const trainerClasses: SimpleTranslationEntries = { - "ace_trainer": "Ace Trainer", - "ace_trainer_female": "Ace Trainer", - "ace_duo": "Ace Duo", - "artist": "Artist", - "artist_female": "Artist", - "backers": "Backers", - "backpacker": "Backpacker", - "backpacker_female": "Backpacker", - "backpackers": "Backpackers", - "baker": "Baker", - "battle_girl": "Battle Girl", - "beauty": "Beauty", - "beginners": "Beginners", - "biker": "Biker", - "black_belt": "Black Belt", - "breeder": "Breeder", - "breeder_female": "Breeder", - "breeders": "Breeders", - "clerk": "Clerk", - "clerk_female": "Clerk", - "colleagues": "Colleagues", - "crush_kin": "Crush Kin", - "cyclist": "Cyclist", - "cyclist_female": "Cyclist", - "cyclists": "Cyclists", - "dancer": "Dancer", - "dancer_female": "Dancer", - "depot_agent": "Depot Agent", - "doctor": "Doctor", - "doctor_female": "Doctor", - "fishermen": "Fishermen", - "fishermen_female": "Fishermen", - "gentleman": "Gentleman", - "guitarist": "Guitarist", - "guitarist_female": "Guitarist", - "harlequin": "Harlequin", - "hiker": "Hiker", - "hooligans": "Hooligans", - "hoopster": "Hoopster", - "infielder": "Infielder", - "janitor": "Janitor", - "lady": "Lady", - "lass": "Lass", - "linebacker": "Linebacker", - "maid": "Maid", - "madame": "Madame", - "medical_team": "Medical Team", - "musican": "Musician", - "hex_maniac": "Hex Maniac", - "nurse": "Nurse", - "nursery_aide": "Nursery Aide", - "officer": "Officer", - "parasol_lady": "Parasol Lady", - "pilot": "Pilot", - "poké_fan": "Poké Fan", - "poké_fan_family": "Poké Fan Family", - "preschooler": "Preschooler", - "preschooler_female": "Preschooler", - "preschoolers": "Preschoolers", - "psychic": "Psychic", - "psychic_female": "Psychic", - "psychics": "Psychics", - "pokémon_ranger": "Pokémon Ranger", - "pokémon_rangers": "Pokémon Ranger", - "ranger": "Ranger", - "restaurant_staff": "Restaurant Staff", - "rich_boy": "Rich Boy", - "rich_couple": "Rich Couple", - "rich_kids": "Rich Kids", - "roughneck": "Roughneck", - "scientist": "Scientist", - "scientist_female": "Scientist", - "scientists": "Scientists", - "smasher": "Smasher", - "snow_worker": "Snow Worker", - "snow_worker_female": "Snow Worker", - "striker": "Striker", - "school_kid": "School Kid", - "school_kid_female": "School Kid", - "school_kids": "School Kids", - "swimmer": "Swimmer", - "swimmer_female": "Swimmer", - "swimmers": "Swimmers", - "twins": "Twins", - "veteran": "Veteran", - "veteran_female": "Veteran", - "veteran_duo": "Veteran Duo", - "waiter": "Waiter", - "waitress": "Waitress", - "worker": "Worker", - "worker_female": "Worker", - "youngster": "Youngster" + "ace_trainer": "精英训练家", + "ace_trainer_female": "精英训练家", + "ace_duo": "精英组合", + "artist": "艺术家", + "artist_female": "艺术家", + "backers": "啦啦队", + "backpacker": "背包客", + "backpacker_female": "背包客", + "backpackers": "背包客组合", + "baker": "面包师", + "battle_girl": "对战少女", + "beauty": "大姐姐", + "beginners": "新人训练家组合", + "biker": "飙车族", + "black_belt": "空手道王", + "breeder": "宝可梦培育家", + "breeder_female": "宝可梦培育家", + "breeders": "宝可梦培育家组合", + "clerk": "商务人士", + "clerk_female": "职场OL", + "colleagues": "商务伙伴", + "crush_kin": "格斗姐弟", + "cyclist": "自行车手", + "cyclist_female": "自行车手", + "cyclists": "自行车手组合", + "dancer": "舞者", + "dancer_female": "舞者", + "depot_agent": "铁路员工", + "doctor": "医生", + "doctor_female": "医生", + "fisherman": "垂钓者", + "fisherman_female": "垂钓者", + "gentleman": "绅士", + "guitarist": "吉他手", + "guitarist_female": "吉他手", + "harlequin": "滑稽演员", + "hiker": "登山男", + "hooligans": "坏组合", + "hoopster": "篮球选手", + "infielder": "棒球选手", + "janitor": "清洁员", + "lady": "千金小姐", + "lass": "迷你裙", + "linebacker": "美式橄榄球选手", + "maid": "女仆", + "madame": "女士", + "medical_team": "医疗团队", + "musician": "音乐家", + "hex_maniac": "灵异迷", + "nurse": "护士", + "nursery_aide": "幼儿园老师", + "officer": "警察", + "parasol_lady": "阳伞姐姐", + "pilot": "飞行员", + "poké_fan": "发烧友俱乐部", + "poké_fan_family": "同好夫妇", + "preschooler": "幼儿园小朋友", + "preschooler_female": "幼儿园小朋友", + "preschoolers": "幼儿园小朋友组合", + "psychic": "超能力者", + "psychic_female": "超能力者", + "psychics": "超能力者组合", + "pokémon_ranger": "宝可梦巡护员", + "pokémon_rangers": "宝可梦巡护员组合", + "ranger": "巡护员", + "restaurant_staff": "服务生组合", + "rich": "Rich", + "rich_female": "Rich", + "rich_boy": "富家少爷", + "rich_couple": "富豪夫妇", + "rich_kid": "Rich Kid", + "rich_kid_female": "Rich Kid", + "rich_kids": "富二代组合", + "roughneck": "光头男", + "scientist": "研究员", + "scientist_female": "研究员", + "scientists": "研究员组合", + "smasher": "网球选手", + "snow_worker": "雪地工人", + "snow_worker_female": "雪地工人", + "striker": "足球选手", + "school_kid": "补习班学生", + "school_kid_female": "补习班学生", + "school_kids": "补习班学生组合", + "swimmer": "泳裤小伙子", + "swimmer_female": "比基尼大姐姐", + "swimmers": "泳装情侣", + "twins": "双胞胎", + "veteran": "资深训练家", + "veteran_female": "资深训练家", + "veteran_duo": "资深组合", + "waiter": "服务生", + "waitress": "女服务生", + "worker": "工人", + "worker_female": "工人", + "workers": "工人组合", + "youngster": "短裤小子" } as const; // Names of special trainers like gym leaders, elite four, and the champion export const trainerNames: SimpleTranslationEntries = { - "brock": "Brock", - "misty": "Misty", - "lt_surge": "Lt Surge", - "erika": "Erika", - "janine": "Janine", - "sabrina": "Sabrina", - "blaine": "Blaine", - "giovanni": "Giovanni", - "falkner": "Falkner", - "bugsy": "Bugsy", - "whitney": "Whitney", - "morty": "Morty", - "chuck": "Chuck", - "jasmine": "Jasmine", - "pryce": "Pryce", - "clair": "Clair", - "roxanne": "Roxanne", - "brawly": "Brawly", - "wattson": "Wattson", - "flannery": "Flannery", - "norman": "Norman", - "winona": "Winona", - "tate": "Tate", - "liza": "Liza", - "juan": "Juan", - "roark": "Roark", - "gardenia": "Gardenia", - "maylene": "Maylene", - "crasher_wake": "Crasher Wake", - "fantina": "Fantina", - "byron": "Byron", - "candice": "Candice", - "volkner": "Volkner", - "cilan": "Cilan", - "chili": "Chili", - "cress": "Cress", - "cheren": "Cheren", - "lenora": "Lenora", - "roxie": "Roxie", - "burgh": "Burgh", - "elesa": "Elesa", - "clay": "Clay", - "skyla": "Skyla", - "brycen": "Brycen", - "drayden": "Drayden", - "marlon": "Marlon", - "viola": "Viola", - "grant": "Grant", - "korrina": "Korrina", - "ramos": "Ramos", - "clemont": "Clemont", - "valerie": "Valerie", - "olympia": "Olympia", - "wulfric": "Wulfric", - "milo": "Milo", - "nessa": "Nessa", - "kabu": "Kabu", - "bea": "Bea", - "allister": "Allister", - "opal": "Opal", - "bede": "Bede", - "gordie": "Gordie", - "melony": "Melony", - "piers": "Piers", - "marnie": "Marnie", - "raihan": "Raihan", - "katy": "Katy", - "brassius": "Brassius", - "iono": "Iono", - "kofu": "Kofu", - "larry": "Larry", - "ryme": "Ryme", - "tulip": "Tulip", - "grusha": "Grusha", - "lorelei": "Lorelei", - "bruno": "Bruno", - "agatha": "Agatha", - "lance": "Lance", - "will": "Will", - "koga": "Koga", - "karen": "Karen", - "sidney": "Sidney", - "phoebe": "Phoebe", - "glacia": "Glacia", - "drake": "Drake", - "aaron": "Aaron", - "bertha": "Bertha", - "flint": "Flint", - "lucian": "Lucian", - "shauntal": "Shauntal", - "marshal": "Marshal", - "grimsley": "Grimsley", - "caitlin": "Caitlin", - "malva": "Malva", - "siebold": "Siebold", - "wikstrom": "Wikstrom", - "drasna": "Drasna", - "hala": "Hala", - "molayne": "Molayne", - "olivia": "Olivia", - "acerola": "Acerola", - "kahili": "Kahili", - "rika": "Rika", - "poppy": "Poppy", - "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) - "hassel": "Hassel", - "crispin": "Crispin", - "amarys": "Amarys", - "lacey": "Lacey", - "drayton": "Drayton", - "blue": "Blue", - "red": "Red", - "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here) - "steven": "Steven", - "wallace": "Wallace", - "cynthia": "Cynthia", - "alder": "Alder", - "iris": "Iris", - "diantha": "Diantha", - "hau": "Hau", - "geeta": "Geeta", - "nemona": "Nemona", - "kieran": "Kieran", - "leon": "Leon", - "rival": "Finn", - "rival_female": "Ivy", + // ---- 馆主 Gym leader ---- + // 关都地区 Kanto Region + "brock": "小刚", + "misty": "小霞", + "lt_surge": "马志士", + "erika": "莉佳", + "janine": "阿杏", + "sabrina": "娜姿", + "blaine": "夏伯", + "giovanni": "坂木", + + // 城都地区 Johto Region + "falkner": "阿速", + "bugsy": "阿笔", + "whitney": "小茜", + "morty": "松叶", + "chuck": "阿四", + "jasmine": "阿蜜", + "pryce": "柳伯", + "clair": "小椿", + + // 丰缘地区 Hoenn Region + "roxanne": "杜娟", + "brawly": "藤树", + "wattson": "铁旋", + "flannery": "亚莎", + "norman": "千里", + "winona": "娜琪", + "tate": "小枫", + "liza": "小南", + "juan": "亚当", + + // 神奥地区 Sinnoh Region + "roark": "瓢太", + "gardenia": "菜种", + "maylene": "阿李", + "crasher_wake": "吉宪", + "fantina": "梅丽莎", + "byron": "东瓜", + "candice": "小菘", + "volkner": "电次", + + // 合众地区 Unova Region + "cilan": "天桐", + "chili": "伯特", + "cress": "寇恩", + "cheren": "黑连", + "lenora": "芦荟", + "roxie": "霍米加", + "burgh": "亚堤", + "elesa": "小菊儿", + "clay": "菊老大", + "skyla": "风露", + "brycen": "哈奇库", + "drayden": "夏卡", + "marlon": "西子伊", + + // 卡洛斯地区 Kalos Region + "viola": "紫罗兰", + "grant": "查克洛", + "korrina": "可尔妮", + "ramos": "福爷", + "clemont": "希特隆", + "valerie": "玛绣", + "olympia": "葛吉花", + "wulfric": "得抚", + + // 伽勒尔地区 Galar Region + "milo": "亚洛", + "nessa": "露璃娜", + "kabu": "卡芜", + "bea": "彩豆", + "allister": "欧尼奥", + "opal": "波普菈", + "bede": "彼特", + "gordie": "玛瓜", + "melony": "美蓉", + "piers": "聂梓", + "marnie": "玛俐", + "raihan": "奇巴纳", + + // 帕底亚地区 Paldea Region + "katy": "阿枫", + "brassius": "寇沙", + "iono": "奇树", + "kofu": "海岱", + "larry": "青木", + "ryme": "莱姆", + "tulip": "莉普", + "grusha": "古鲁夏", + + // ---- 四天王 Elite Four ---- + // 关都地区 Kanto Region + "lorelei": "科拿", + "bruno": "希巴", + "agatha": "菊子", + "lance": "阿渡", + + // 城都地区 Johto Region + "will": "一树", + "koga": "阿桔", + "karen": "梨花", + + // 丰都地区 Hoenn Region + "sidney": "花月", + "phoebe": "芙蓉", + "glacia": "波妮", + "drake": "源治", + + // 神奥地区 Sinnoh Region + "aaron": "阿柳", + "bertha": "菊野", + "flint": "大叶", + "lucian": "悟松", + + // 合众地区 Unova Region + "shauntal": "婉龙", + "marshal": "连武", + "grimsley": "越橘", + "caitlin": "嘉德丽雅", + + // 卡洛斯地区 Kalos Region + "malva": "帕琦拉", + "siebold": "志米", + "wikstrom": "雁铠", + "drasna": "朵拉塞娜", + + // 阿罗拉地区 Alola Region + "hala": "哈拉", + "molayne": "马睿因", + "olivia": "丽姿", + "acerola": "阿塞萝拉", + "kahili": "卡希丽", + + // 帕底亚地区 Paldea Region + "rika": "辛俐", + "poppy": "波琵", + "hassel": "八朔", + + // 蓝莓学院 Blueberry Academy + "crispin": "赤松", + "amarys": "纳莉", + "lacey": "紫竽", + "drayton": "杜若", + + // ---- 冠军 Champion ---- + // 关都地区 Kanto Region + "blue": "青绿", + "red": "赤红", + + // 丰缘地区 Hoenn Region + "steven": "大吾", + "wallace": "米可利", + + // 神奥地区 Sinnoh Region + "cynthia": "竹兰", + + // 合众地区 Unova Region + "alder": "阿戴克", + "iris": "艾莉丝", + + // 卡洛斯地区 Kalos Region + "diantha": "卡露妮", + + // 阿罗拉地区 Alola Region + "hau": "哈乌", + + // 伽勒尔地区 Galar Region + "leon": "丹帝", + + // 帕底亚地区 paldea Region + "geeta": "也慈", + "nemona": "妮莫", + + // 蓝莓学院 Blueberry academy + "kieran": "乌栗", + + // 劲敌 rival + "rival": "芬恩", + "rival_female": "艾薇", } as const; diff --git a/src/locales/zh_CN/weather.ts b/src/locales/zh_CN/weather.ts index 50fb2227b2b..f78de2339c0 100644 --- a/src/locales/zh_CN/weather.ts +++ b/src/locales/zh_CN/weather.ts @@ -4,33 +4,33 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; * The weather namespace holds text displayed when weather is active during a battle */ export const weather: SimpleTranslationEntries = { - "sunnyStartMessage": "日照变强了!", + "sunnyStartMessage": "日照变强了！", "sunnyLapseMessage": "日照很强。", "sunnyClearMessage": "日照复原了。", - "rainStartMessage": "下大雨了！", + "rainStartMessage": "开始下雨了！", "rainLapseMessage": "雨继续下。", "rainClearMessage": "雨停了。", - "sandstormStartMessage": "开始刮沙尘暴了！", - "sandstormLapseMessage": "沙尘暴肆虐。", - "sandstormClearMessage": "沙尘暴停止了。", - "sandstormDamageMessage": "沙尘暴袭击了{{pokemonPrefix}}{{pokemonName}}!", + "sandstormStartMessage": "开始刮沙暴了！", + "sandstormLapseMessage": "沙暴肆虐。", + "sandstormClearMessage": "沙暴停止了！", + "sandstormDamageMessage": "沙暴袭击了{{pokemonPrefix}}{{pokemonName}}！", - "hailStartMessage": "开始下冰雹了!", + "hailStartMessage": "开始下冰雹了！", "hailLapseMessage": "冰雹继续肆虐。", "hailClearMessage": "冰雹不再下了。", - "hailDamageMessage": "冰雹袭击了{{pokemonPrefix}}{{pokemonName}}!", + "hailDamageMessage": "冰雹袭击了{{pokemonPrefix}}{{pokemonName}}！", - "snowStartMessage": "开始下雪了!", + "snowStartMessage": "开始下雪了！", "snowLapseMessage": "雪继续下。", "snowClearMessage": "雪停了。", - "fogStartMessage": "起雾了!", + "fogStartMessage": "起雾了！", "fogLapseMessage": "雾很浓。", "fogClearMessage": "雾散了。", - "heavyRainStartMessage": "开始下起了暴雨!", + "heavyRainStartMessage": "开始下起了暴雨！", "heavyRainLapseMessage": "暴雨势头不减。", "heavyRainClearMessage": "暴雨停了。", @@ -38,7 +38,7 @@ export const weather: SimpleTranslationEntries = { "harshSunLapseMessage": "强日照势头不减。", "harshSunClearMessage": "日照复原了。", - "strongWindsStartMessage": "吹起了神秘的乱流!", + "strongWindsStartMessage": "吹起了神秘的乱流！", "strongWindsLapseMessage": "神秘的乱流势头不减。", "strongWindsClearMessage": "神秘的乱流停止了。" } \ No newline at end of file diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 50bf2f78a0c..278de2f18e8 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -511,7 +511,7 @@ export class AttackTypeBoosterModifierType extends PokemonHeldItemModifierType i getDescription(scene: BattleScene): string { // TODO: Need getTypeName? - return i18next.t(`modifierType:ModifierType.AttackTypeBoosterModifierType.description`, { moveType: Utils.toReadableString(Type[this.moveType]) }); + return i18next.t(`modifierType:ModifierType.AttackTypeBoosterModifierType.description`, { moveType: i18next.t(`pokemonInfo:Type.${Type[this.moveType]}`) }); } getPregenArgs(): any[] { @@ -898,11 +898,11 @@ export class TerastallizeModifierType extends PokemonHeldItemModifierType implem } get name(): string { - return i18next.t(`modifierType:ModifierType.TerastallizeModifierType.name`, { teraType: i18next.t(`modifierType:TeraType.${Type[this.teraType]}`) }); + return i18next.t(`modifierType:ModifierType.TerastallizeModifierType.name`, { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) }); } getDescription(scene: BattleScene): string { - return i18next.t(`modifierType:ModifierType.TerastallizeModifierType.description`, { teraType: i18next.t(`modifierType:TeraType.${Type[this.teraType]}`) }); + return i18next.t(`modifierType:ModifierType.TerastallizeModifierType.description`, { teraType: i18next.t(`pokemonInfo:Type.${Type[this.teraType]}`) }); } getPregenArgs(): any[] { @@ -1194,11 +1194,11 @@ const modifierPool: ModifierPool = { return thresholdPartyMemberCount; }, 3), new WeightedModifierType(modifierTypes.ETHER, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMove().pp - m.ppUsed) <= 5).length).length, 3); + const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMovePp() - m.ppUsed) <= 5).length).length, 3); return thresholdPartyMemberCount * 3; }, 9), new WeightedModifierType(modifierTypes.MAX_ETHER, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMove().pp - m.ppUsed) <= 5).length).length, 3); + const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMovePp() - m.ppUsed) <= 5).length).length, 3); return thresholdPartyMemberCount; }, 3), new WeightedModifierType(modifierTypes.LURE, 2), @@ -1237,11 +1237,11 @@ const modifierPool: ModifierPool = { return thresholdPartyMemberCount; }, 3), new WeightedModifierType(modifierTypes.ELIXIR, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMove().pp - m.ppUsed) <= 5).length).length, 3); + const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMovePp() - m.ppUsed) <= 5).length).length, 3); return thresholdPartyMemberCount * 3; }, 9), new WeightedModifierType(modifierTypes.MAX_ELIXIR, (party: Pokemon[]) => { - const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMove().pp - m.ppUsed) <= 5).length).length, 3); + const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => (m.getMovePp() - m.ppUsed) <= 5).length).length, 3); return thresholdPartyMemberCount; }, 3), new WeightedModifierType(modifierTypes.DIRE_HIT, 4), diff --git a/src/overrides.ts b/src/overrides.ts index 704019a1d80..b7307ab2f7f 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -48,6 +48,13 @@ export const POKEBALL_OVERRIDE: { active: boolean, pokeballs: PokeballCounts } = export const STARTER_FORM_OVERRIDE: integer = 0; // default 5 or 20 for Daily export const STARTING_LEVEL_OVERRIDE: integer = 0; +/** + * SPECIES OVERRIDE + * will only apply to the first starter in your party or each enemy pokemon + * default is 0 to not override + * @example SPECIES_OVERRIDE = Species.Bulbasaur; + */ +export const STARTER_SPECIES_OVERRIDE: Species | integer = 0; export const ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const MOVESET_OVERRIDE: Array = []; @@ -58,21 +65,13 @@ export const VARIANT_OVERRIDE: Variant = 0; * OPPONENT / ENEMY OVERRIDES */ +export const OPP_SPECIES_OVERRIDE: Species | integer = 0; export const OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const OPP_PASSIVE_ABILITY_OVERRIDE = Abilities.NONE; export const OPP_MOVESET_OVERRIDE: Array = []; export const OPP_SHINY_OVERRIDE: boolean = false; export const OPP_VARIANT_OVERRIDE: Variant = 0; -/** - * SPECIES OVERRIDE - * will only apply to the first starter in your party or each enemy pokemon - * default is 0 to not override - * @example SPECIES_OVERRIDE = Species.Bulbasaur; - */ -export const STARTER_SPECIES_OVERRIDE: Species | integer = 0; -export const OPP_SPECIES_OVERRIDE: Species | integer = 0; - /** * MODIFIER / ITEM OVERRIDES * if count is not provided, it will default to 1 diff --git a/src/phases.ts b/src/phases.ts index 90039502c30..f70fe9e857a 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -37,7 +37,7 @@ import { BattleType, BattlerIndex, TurnCommand } from "./battle"; import { BattleSpec } from "./enums/battle-spec"; import { Species } from "./data/enums/species"; import { HealAchv, LevelAchv, achvs } from "./system/achv"; -import { TrainerSlot, trainerConfigs } from "./data/trainer-config"; +import { TrainerConfig, TrainerSlot, trainerConfigs } from "./data/trainer-config"; import { TrainerType } from "./data/enums/trainer-type"; import { EggHatchPhase } from "./egg-hatch-phase"; import { Egg } from "./data/egg"; @@ -46,7 +46,7 @@ import { loggedInUser, updateUserInfo } from "./account"; import { PlayerGender, SessionSaveData } from "./system/game-data"; import { addPokeballCaptureStars, addPokeballOpenParticles } from "./field/anims"; import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeManualTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangePreMoveTrigger } from "./data/pokemon-forms"; -import { battleSpecDialogue, getCharVariantFromDialogue } from "./data/dialogue"; +import { battleSpecDialogue, getCharVariantFromDialogue, miscDialogue } from "./data/dialogue"; import ModifierSelectUiHandler, { SHOP_OPTIONS_ROW_LIMIT } from "./ui/modifier-select-ui-handler"; import { Setting } from "./system/settings"; import { Tutorial, handleTutorial } from "./tutorial"; @@ -59,6 +59,9 @@ import PokemonSpecies, { getPokemonSpecies, getPokemonSpeciesForm, speciesStarte import i18next from './plugins/i18n'; import { Abilities } from "./data/enums/abilities"; import * as Overrides from './overrides'; +import { TextStyle, addTextObject } from "./ui/text"; +import { Type } from "./data/type"; + export class LoginPhase extends Phase { private showText: boolean; @@ -160,7 +163,6 @@ export class TitlePhase extends Phase { this.scene.gameData.getSession(loggedInUser.lastSessionSlot).then(sessionData => { if (sessionData) { this.lastSessionData = sessionData; - console.log(sessionData); const biomeKey = getBiomeKey(sessionData.arena.biome); const bgTexture = `${biomeKey}_bg`; this.scene.arenaBg.setTexture(bgTexture); @@ -841,8 +843,15 @@ export class EncounterPhase extends BattlePhase { if (this.scene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) return i18next.t('battle:bossAppeared', {bossName: enemyField[0].name}); - if (this.scene.currentBattle.battleType === BattleType.TRAINER) - return i18next.t('battle:trainerAppeared', {trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true)}); + if (this.scene.currentBattle.battleType === BattleType.TRAINER) { + if (this.scene.currentBattle.double) { + return i18next.t('battle:trainerAppearedDouble', {trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true)}); + + } + else { + return i18next.t('battle:trainerAppeared', {trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true)}); + } + } return enemyField.length === 1 ? i18next.t('battle:singleWildAppeared', {pokemonName: enemyField[0].name}) @@ -1809,7 +1818,14 @@ export class CommandPhase extends FieldPhase { if (!isSwitch && this.fieldIndex) this.scene.currentBattle.turnCommands[this.fieldIndex - 1].skip = true; } else if (trapTag) { - if (!isSwitch) { + if(trapTag.sourceMove === Moves.INGRAIN && this.scene.getPokemonById(trapTag.sourceId).isOfType(Type.GHOST)) { + success = true; + this.scene.currentBattle.turnCommands[this.fieldIndex] = isSwitch + ? { command: Command.POKEMON, cursor: cursor, args: args } + : { command: Command.RUN }; + break; + } + if (!isSwitch) { this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex); this.scene.ui.setMode(Mode.MESSAGE); } @@ -2581,7 +2597,8 @@ export class MoveEffectPhase extends PokemonPhase { } hitCheck(target: Pokemon): boolean { - if (this.move.getMove().moveTarget === MoveTarget.USER) + // Moves targeting the user and entry hazards can't miss + if ([MoveTarget.USER, MoveTarget.ENEMY_SIDE].includes(this.move.getMove().moveTarget)) return true; const user = this.getUserPokemon(); @@ -3212,11 +3229,10 @@ export class FaintPhase extends PokemonPhase { if (defeatSource?.isOnField()) { applyPostVictoryAbAttrs(PostVictoryAbAttr, defeatSource); const pvmove = allMoves[pokemon.turnData.attacksReceived[0].move]; - const pvattrs = pvmove.getAttrs(PostVictoryStatChangeAttr); + const pvattrs = pvmove.getAttrs(PostVictoryStatChangeAttr) as PostVictoryStatChangeAttr[]; if (pvattrs.length) { - for (let pvattr of pvattrs) { + for (let pvattr of pvattrs) pvattr.applyPostVictory(defeatSource, defeatSource, pvmove); - } } } } @@ -3531,10 +3547,10 @@ export class GameOverModifierRewardPhase extends ModifierRewardPhase { this.scene.playSound('level_up_fanfare'); this.scene.ui.setMode(Mode.MESSAGE); this.scene.ui.fadeIn(250).then(() => { - this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => { - this.scene.time.delayedCall(1500, () => this.scene.arenaBg.setVisible(true)); - resolve(); - }, null, true, 1500); + this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => { + this.scene.time.delayedCall(1500, () => this.scene.arenaBg.setVisible(true)); + resolve(); + }, null, true, 1500); }); }); }) @@ -3556,11 +3572,9 @@ export class RibbonModifierRewardPhase extends ModifierRewardPhase { this.scene.addModifier(newModifier).then(() => { this.scene.playSound('level_up_fanfare'); this.scene.ui.setMode(Mode.MESSAGE); - this.scene.ui.fadeIn(250).then(() => { - this.scene.ui.showText(`${this.species.name} beat ${this.scene.gameMode.getName()} Mode for the first time!\nYou received ${newModifier.type.name}!`, null, () => { - resolve(); - }, null, true, 1500); - }); + this.scene.ui.showText(`${this.species.name} beat ${this.scene.gameMode.getName()} Mode for the first time!\nYou received ${newModifier.type.name}!`, null, () => { + resolve(); + }, null, true, 1500); }); }) } @@ -3612,6 +3626,7 @@ export class GameOverPhase extends BattlePhase { handleGameOver(): void { const doGameOver = (newClear: boolean) => { + this.scene.disableMenu = true; this.scene.time.delayedCall(1000, () => { let firstClear = false; if (this.victory && newClear) { @@ -3633,20 +3648,40 @@ export class GameOverPhase extends BattlePhase { const activeBattlers = this.scene.getField().filter(p => p?.isActive(true)); activeBattlers.map(p => p.hideInfo()); this.scene.ui.fadeOut(fadeDuration).then(() => { - [ this.scene.field, ...activeBattlers ].map(a => a.setVisible(false)); + activeBattlers.map(a => a.setVisible(false)); this.scene.setFieldScale(1, true); this.scene.clearPhaseQueue(); this.scene.ui.clearText(); - if (newClear) - this.handleUnlocks(); - if (this.victory && newClear) { - for (let species of this.firstRibbons) - this.scene.unshiftPhase(new RibbonModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PLUS, species)); - if (!firstClear) - this.scene.unshiftPhase(new GameOverModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PREMIUM)); + + const clear = (endCardPhase?: EndCardPhase) => { + if (newClear) + this.handleUnlocks(); + if (this.victory && newClear) { + for (let species of this.firstRibbons) + this.scene.unshiftPhase(new RibbonModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PLUS, species)); + if (!firstClear) + this.scene.unshiftPhase(new GameOverModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PREMIUM)); + } + this.scene.pushPhase(new PostGameOverPhase(this.scene, endCardPhase)); + this.end(); } - this.scene.pushPhase(new PostGameOverPhase(this.scene)); - this.end(); + + if (this.victory && this.scene.gameMode.isClassic) { + this.scene.ui.fadeIn(500).then(() => { + this.scene.charSprite.showCharacter(`rival_${this.scene.gameData.gender === PlayerGender.FEMALE ? 'm' : 'f'}`, getCharVariantFromDialogue(miscDialogue.ending[this.scene.gameData.gender === PlayerGender.FEMALE ? 0 : 1])).then(() => { + this.scene.ui.showDialogue(miscDialogue.ending[this.scene.gameData.gender === PlayerGender.FEMALE ? 0 : 1], this.scene.gameData.gender === PlayerGender.FEMALE ? trainerConfigs[TrainerType.RIVAL].name : trainerConfigs[TrainerType.RIVAL].nameFemale, null, () => { + this.scene.ui.fadeOut(500).then(() => { + this.scene.charSprite.hide().then(() => { + const endCardPhase = new EndCardPhase(this.scene); + this.scene.unshiftPhase(endCardPhase); + clear(endCardPhase); + }); + }); + }); + }); + }); + } else + clear(); }); }); }; @@ -3689,6 +3724,41 @@ export class GameOverPhase extends BattlePhase { } } +export class EndCardPhase extends Phase { + public endCard: Phaser.GameObjects.Image; + public text: Phaser.GameObjects.Text; + + constructor(scene: BattleScene) { + super(scene); + } + + start(): void { + super.start(); + + this.scene.ui.getMessageHandler().bg.setVisible(false); + this.scene.ui.getMessageHandler().nameBoxContainer.setVisible(false); + + this.endCard = this.scene.add.image(0, 0, `end_${this.scene.gameData.gender === PlayerGender.FEMALE ? 'f' : 'm'}`); + this.endCard.setOrigin(0); + this.endCard.setScale(0.5); + this.scene.field.add(this.endCard); + + this.text = addTextObject(this.scene, this.scene.game.canvas.width / 12, (this.scene.game.canvas.height / 6) - 16, 'Congratulations!', TextStyle.SUMMARY, { fontSize: '128px' }); + this.text.setOrigin(0.5); + this.scene.field.add(this.text); + + this.scene.ui.clearText(); + + this.scene.ui.fadeIn(1000).then(() => { + + this.scene.ui.showText('', null, () => { + this.scene.ui.getMessageHandler().bg.setVisible(true); + this.end(); + }, null, true); + }); + } +} + export class UnlockPhase extends Phase { private unlockable: Unlockables; @@ -3703,35 +3773,50 @@ export class UnlockPhase extends Phase { this.scene.gameData.unlocks[this.unlockable] = true; this.scene.playSound('level_up_fanfare'); this.scene.ui.setMode(Mode.MESSAGE); - this.scene.ui.fadeIn(250).then(() => { - this.scene.ui.showText(`${getUnlockableName(this.unlockable)}\nhas been unlocked.`, null, () => { - this.scene.time.delayedCall(1500, () => this.scene.arenaBg.setVisible(true)); - this.end(); - }, null, true, 1500); - }); + this.scene.ui.showText(`${getUnlockableName(this.unlockable)}\nhas been unlocked.`, null, () => { + this.scene.time.delayedCall(1500, () => this.scene.arenaBg.setVisible(true)); + this.end(); + }, null, true, 1500); }); } } export class PostGameOverPhase extends Phase { - constructor(scene: BattleScene) { + private endCardPhase: EndCardPhase; + + constructor(scene: BattleScene, endCardPhase: EndCardPhase) { super(scene); + + this.endCardPhase = endCardPhase; } start() { super.start(); - this.scene.gameData.saveAll(this.scene, true, true, true).then(success => { - if (!success) - return this.scene.reset(true); - this.scene.gameData.tryClearSession(this.scene, this.scene.sessionSlotId).then((success: boolean | [boolean, boolean]) => { - if (!success[0]) + const saveAndReset = () => { + this.scene.gameData.saveAll(this.scene, true, true, true).then(success => { + if (!success) return this.scene.reset(true); - this.scene.reset(); - this.scene.unshiftPhase(new TitlePhase(this.scene)); - this.end(); + this.scene.gameData.tryClearSession(this.scene, this.scene.sessionSlotId).then((success: boolean | [boolean, boolean]) => { + if (!success[0]) + return this.scene.reset(true); + this.scene.reset(); + this.scene.unshiftPhase(new TitlePhase(this.scene)); + this.end(); + }); }); - }); + }; + + if (this.endCardPhase) { + this.scene.ui.fadeOut(500).then(() => { + this.scene.ui.getMessageHandler().bg.setVisible(true); + + this.endCardPhase.endCard.destroy(); + this.endCardPhase.text.destroy(); + saveAndReset(); + }); + } else + saveAndReset(); } } diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index 807e1a1b550..790a3c729c8 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -43,7 +43,19 @@ export interface ModifierTypeTranslationEntries { BaseStatBoosterItem: SimpleTranslationEntries, EvolutionItem: SimpleTranslationEntries, FormChangeItem: SimpleTranslationEntries, - TeraType: SimpleTranslationEntries, +} +export interface PokemonInfoTranslationEntries { + Stat: SimpleTranslationEntries, + Type: SimpleTranslationEntries, +} + +export interface BerryTranslationEntry { + name: string, + effect: string +} + +export interface BerryTranslationEntries { + [key: string]: BerryTranslationEntry } export interface Localizable { @@ -125,7 +137,7 @@ declare module 'i18next' { ability: AbilityTranslationEntries; pokeball: SimpleTranslationEntries; pokemon: SimpleTranslationEntries; - pokemonStat: SimpleTranslationEntries; + pokemonInfo: PokemonInfoTranslationEntries; commandUiHandler: SimpleTranslationEntries; fightUiHandler: SimpleTranslationEntries; titles: SimpleTranslationEntries; @@ -139,6 +151,8 @@ declare module 'i18next' { egg: SimpleTranslationEntries; weather: SimpleTranslationEntries; modifierType: ModifierTypeTranslationEntries; + battleMessageUiHandler: SimpleTranslationEntries; + berry: BerryTranslationEntries; }; } } @@ -149,4 +163,4 @@ export function getIsInitialized(): boolean { return isInitialized; } -let isInitialized = false; \ No newline at end of file +let isInitialized = false; diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index f2e48911e07..88bc3230ce3 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -260,8 +260,23 @@ export default class BattleInfo extends Phaser.GameObjects.Container { if (!this.player) { const dexEntry = pokemon.scene.gameData.dexData[pokemon.species.speciesId]; this.ownedIcon.setVisible(!!dexEntry.caughtAttr); - const dexAttr = pokemon.getDexAttr(); - if ((dexEntry.caughtAttr & dexAttr) < dexAttr || !(pokemon.scene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr & Math.pow(2, pokemon.abilityIndex))) + const opponentPokemonDexAttr = pokemon.getDexAttr(); + + // Check if Player owns all genders and forms of the Pokemon + const missingDexAttrs = ((dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr); + + /** + * If the opposing Pokemon only has 1 normal ability and is using the hidden ability it should have the same behavior + * if it had 2 normal abilities. This code checks if that is the case and uses the correct opponent Pokemon abilityIndex (2) + * for calculations so it aligns with where the hidden ability is stored in the starter data's abilityAttr (4) + */ + const opponentPokemonOneNormalAbility = (pokemon.species.getAbilityCount() === 2); + const opponentPokemonAbilityIndex = (opponentPokemonOneNormalAbility && pokemon.abilityIndex === 1) ? 2 : pokemon.abilityIndex; + const opponentPokemonAbilityAttr = Math.pow(2, opponentPokemonAbilityIndex); + + const rootFormHasHiddenAbility = pokemon.scene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr & opponentPokemonAbilityAttr; + + if (missingDexAttrs || !rootFormHasHiddenAbility) this.ownedIcon.setTint(0x808080); if (this.boss) diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index d04a98ea810..b7dccef52b5 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -7,6 +7,7 @@ import { getStatName, Stat } from "../data/pokemon-stat"; import { addWindow } from "./ui-theme"; import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import {Button} from "../enums/buttons"; +import i18next from '../plugins/i18n'; export default class BattleMessageUiHandler extends MessageUiHandler { private levelUpStatsContainer: Phaser.GameObjects.Container; @@ -31,7 +32,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler { this.textCallbackTimer = null; const bg = this.scene.add.sprite(0, 0, 'bg', this.scene.windowType); - bg.setOrigin(0, 1); + bg.setOrigin(0, 1); ui.add(bg); this.bg = bg; @@ -234,20 +235,20 @@ export default class BattleMessageUiHandler extends MessageUiHandler { const textStyle: TextStyle = isBetter ? TextStyle.SUMMARY_GREEN : TextStyle.SUMMARY; const color = getTextColor(textStyle, false, uiTheme); return `[color=${color}][shadow=${getTextColor(textStyle, true, uiTheme)}]${text}[/shadow][/color]`; - }; +}; - if (value > 30) - return coloredText('Best', value > starterIvs[typeIv]); - if (value === 30) - return coloredText('Fantastic', value > starterIvs[typeIv]); - if (value > 20) - return coloredText('Very Good', value > starterIvs[typeIv]); - if (value > 10) - return coloredText('Pretty Good', value > starterIvs[typeIv]); - if (value > 0) - return coloredText('Decent', value > starterIvs[typeIv]); + if (value > 30) + return coloredText(i18next.t('battleMessageUiHandler:ivBest'), value > starterIvs[typeIv]); + if (value === 30) + return coloredText(i18next.t('battleMessageUiHandler:ivFantastic'), value > starterIvs[typeIv]); + if (value > 20) + return coloredText(i18next.t('battleMessageUiHandler:ivVeryGood'), value > starterIvs[typeIv]); + if (value > 10) + return coloredText(i18next.t('battleMessageUiHandler:ivPrettyGood'), value > starterIvs[typeIv]); + if (value > 0) + return coloredText(i18next.t('battleMessageUiHandler:ivDecent'), value > starterIvs[typeIv]); - return coloredText('No Good', value > starterIvs[typeIv]); + return coloredText(i18next.t('battleMessageUiHandler:ivNoGood'), value > starterIvs[typeIv]); } showNameText(name: string): void { diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index 35f3e34ad78..943679cae39 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -806,7 +806,7 @@ export default class SummaryUiHandler extends UiHandler { const natureStatMultiplier = getNatureStatMultiplier(this.pokemon.getNature(), s); - const statLabel = addTextObject(this.scene, 27 + 115 * colIndex, 56 + 16 * rowIndex, statName, natureStatMultiplier === 1 ? TextStyle.SUMMARY : natureStatMultiplier > 1 ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE); + const statLabel = addTextObject(this.scene, 27 + 115 * colIndex + (colIndex == 1 ? 5 : 0), 56 + 16 * rowIndex, statName, natureStatMultiplier === 1 ? TextStyle.SUMMARY : natureStatMultiplier > 1 ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE); statLabel.setOrigin(0.5, 0); statsContainer.add(statLabel);