diff --git a/package-lock.json b/package-lock.json index 52cc628872a..9531244a42d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pokemon-rogue-battle", - "version": "1.4.3", + "version": "1.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pokemon-rogue-battle", - "version": "1.4.3", + "version": "1.5.0", "hasInstallScript": true, "dependencies": { "@material/material-color-utilities": "^0.2.7", diff --git a/package.json b/package.json index e52c5928da7..9d8adb8c1c0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pokemon-rogue-battle", "private": true, - "version": "1.4.3", + "version": "1.5.0", "type": "module", "scripts": { "start": "vite", diff --git a/public/images/events/yearofthesnakeevent-de.png b/public/images/events/yearofthesnakeevent-de.png new file mode 100644 index 00000000000..f5e684bbcd5 Binary files /dev/null and b/public/images/events/yearofthesnakeevent-de.png differ diff --git a/public/images/events/yearofthesnakeevent-en.png b/public/images/events/yearofthesnakeevent-en.png new file mode 100644 index 00000000000..ddd34023b94 Binary files /dev/null and b/public/images/events/yearofthesnakeevent-en.png differ diff --git a/public/images/events/yearofthesnakeevent-es-ES.png b/public/images/events/yearofthesnakeevent-es-ES.png new file mode 100644 index 00000000000..76474c475c5 Binary files /dev/null and b/public/images/events/yearofthesnakeevent-es-ES.png differ diff --git a/public/images/events/yearofthesnakeevent-fr.png b/public/images/events/yearofthesnakeevent-fr.png new file mode 100644 index 00000000000..88ad3e770ca Binary files /dev/null and b/public/images/events/yearofthesnakeevent-fr.png differ diff --git a/public/images/events/yearofthesnakeevent-it.png b/public/images/events/yearofthesnakeevent-it.png new file mode 100644 index 00000000000..a02e7048d2a Binary files /dev/null and b/public/images/events/yearofthesnakeevent-it.png differ diff --git a/public/images/events/yearofthesnakeevent-ja.png b/public/images/events/yearofthesnakeevent-ja.png new file mode 100644 index 00000000000..ba13b5d281f Binary files /dev/null and b/public/images/events/yearofthesnakeevent-ja.png differ diff --git a/public/images/events/yearofthesnakeevent-ko.png b/public/images/events/yearofthesnakeevent-ko.png new file mode 100644 index 00000000000..dca6bcbbd15 Binary files /dev/null and b/public/images/events/yearofthesnakeevent-ko.png differ diff --git a/public/images/events/yearofthesnakeevent-pt-BR.png b/public/images/events/yearofthesnakeevent-pt-BR.png new file mode 100644 index 00000000000..a535aec2aa5 Binary files /dev/null and b/public/images/events/yearofthesnakeevent-pt-BR.png differ diff --git a/public/images/events/yearofthesnakeevent-zh-CN.png b/public/images/events/yearofthesnakeevent-zh-CN.png new file mode 100644 index 00000000000..3ab4fc565a7 Binary files /dev/null and b/public/images/events/yearofthesnakeevent-zh-CN.png differ diff --git a/public/images/pokemon/back/249.json b/public/images/pokemon/back/249.json index 52784b825f8..7f126e8c62c 100644 --- a/public/images/pokemon/back/249.json +++ b/public/images/pokemon/back/249.json @@ -1,2540 +1,686 @@ -{ - "textures": [ - { - "image": "249.png", - "format": "RGBA8888", - "size": { - "w": 610, - "h": 610 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 25, - "y": 5, - "w": 99, - "h": 88 - }, - "frame": { - "x": 230, - "y": 137, - "w": 99, - "h": 88 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 5, - "w": 99, - "h": 88 - }, - "frame": { - "x": 329, - "y": 141, - "w": 99, - "h": 88 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 26, - "y": 0, - "w": 84, - "h": 97 - }, - "frame": { - "x": 526, - "y": 141, - "w": 84, - "h": 97 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 27, - "y": 4, - "w": 96, - "h": 89 - }, - "frame": { - "x": 0, - "y": 216, - "w": 96, - "h": 89 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 96, - "h": 89 - }, - "frame": { - "x": 96, - "y": 222, - "w": 96, - "h": 89 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 7, - "w": 95, - "h": 90 - }, - "frame": { - "x": 290, - "y": 229, - "w": 95, - "h": 90 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 7, - "w": 95, - "h": 90 - }, - "frame": { - "x": 290, - "y": 229, - "w": 95, - "h": 90 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 4, - "w": 95, - "h": 90 - }, - "frame": { - "x": 385, - "y": 230, - "w": 95, - "h": 90 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 6, - "w": 95, - "h": 91 - }, - "frame": { - "x": 95, - "y": 311, - "w": 95, - "h": 91 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 32, - "y": 2, - "w": 92, - "h": 91 - }, - "frame": { - "x": 190, - "y": 315, - "w": 92, - "h": 91 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 32, - "y": 2, - "w": 92, - "h": 91 - }, - "frame": { - "x": 190, - "y": 315, - "w": 92, - "h": 91 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 16, - "y": 5, - "w": 101, - "h": 91 - }, - "frame": { - "x": 282, - "y": 319, - "w": 101, - "h": 91 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 5, - "w": 94, - "h": 92 - }, - "frame": { - "x": 383, - "y": 320, - "w": 94, - "h": 92 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 16, - "y": 4, - "w": 100, - "h": 92 - }, - "frame": { - "x": 477, - "y": 329, - "w": 100, - "h": 92 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 94, - "h": 92 - }, - "frame": { - "x": 0, - "y": 396, - "w": 94, - "h": 92 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 29, - "y": 2, - "w": 91, - "h": 92 - }, - "frame": { - "x": 94, - "y": 402, - "w": 91, - "h": 92 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 29, - "y": 2, - "w": 91, - "h": 92 - }, - "frame": { - "x": 94, - "y": 402, - "w": 91, - "h": 92 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 2, - "w": 92, - "h": 92 - }, - "frame": { - "x": 185, - "y": 406, - "w": 92, - "h": 92 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 6, - "w": 96, - "h": 92 - }, - "frame": { - "x": 277, - "y": 410, - "w": 96, - "h": 92 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 2, - "w": 92, - "h": 93 - }, - "frame": { - "x": 465, - "y": 421, - "w": 92, - "h": 93 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 4, - "w": 93, - "h": 94 - }, - "frame": { - "x": 0, - "y": 488, - "w": 93, - "h": 94 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 1, - "w": 90, - "h": 95 - }, - "frame": { - "x": 93, - "y": 494, - "w": 90, - "h": 95 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 1, - "w": 90, - "h": 95 - }, - "frame": { - "x": 93, - "y": 494, - "w": 90, - "h": 95 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 3, - "w": 93, - "h": 95 - }, - "frame": { - "x": 183, - "y": 498, - "w": 93, - "h": 95 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 0, - "w": 86, - "h": 96 - }, - "frame": { - "x": 276, - "y": 502, - "w": 86, - "h": 96 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 0, - "w": 86, - "h": 96 - }, - "frame": { - "x": 276, - "y": 502, - "w": 86, - "h": 96 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 1, - "w": 90, - "h": 96 - }, - "frame": { - "x": 362, - "y": 505, - "w": 90, - "h": 96 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 2, - "w": 90, - "h": 96 - }, - "frame": { - "x": 452, - "y": 514, - "w": 90, - "h": 96 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d1fca3cca7f334c5072e6d9eac438f12:ad4656a8607db0b15f07d4c8860395b7:25c89a8ec37b43392b53a70993acdff3$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 690, "y": 66, "w": 103, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 14, "w": 103, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 554, "y": 0, "w": 136, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 33, "w": 136, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 143, "y": 69, "w": 141, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 40, "w": 141, "h": 63 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 409, "y": 0, "w": 145, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 38, "w": 145, "h": 65 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 143, "y": 0, "w": 144, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 33, "w": 144, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 143, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 30, "w": 143, "h": 71 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 409, "y": 65, "w": 131, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 131, "h": 68 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 540, "y": 69, "w": 134, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 33, "w": 134, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 690, "y": 0, "w": 139, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 32, "w": 139, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 287, "y": 0, "w": 122, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 122, "h": 81 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 380, "y": 133, "w": 96, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 10, "w": 96, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 573, "y": 135, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 653, "y": 242, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 665, "y": 152, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 690, "y": 66, "w": 103, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 14, "w": 103, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 554, "y": 0, "w": 136, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 33, "w": 136, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 143, "y": 69, "w": 141, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 40, "w": 141, "h": 63 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 409, "y": 0, "w": 145, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 38, "w": 145, "h": 65 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 143, "y": 0, "w": 144, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 33, "w": 144, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 143, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 30, "w": 143, "h": 71 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 409, "y": 65, "w": 131, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 131, "h": 68 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 540, "y": 69, "w": 134, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 33, "w": 134, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 690, "y": 0, "w": 139, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 32, "w": 139, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 287, "y": 0, "w": 122, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 122, "h": 81 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 380, "y": 133, "w": 96, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 10, "w": 96, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 573, "y": 135, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 653, "y": 242, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 665, "y": 152, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 690, "y": 66, "w": 103, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 14, "w": 103, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 554, "y": 0, "w": 136, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 33, "w": 136, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 143, "y": 69, "w": 141, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 40, "w": 141, "h": 63 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 409, "y": 0, "w": 145, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 38, "w": 145, "h": 65 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 143, "y": 0, "w": 144, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 33, "w": 144, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 143, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 30, "w": 143, "h": 71 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 409, "y": 65, "w": 131, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 131, "h": 68 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 540, "y": 69, "w": 134, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 33, "w": 134, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 690, "y": 0, "w": 139, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 32, "w": 139, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 287, "y": 0, "w": 122, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 122, "h": 81 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 380, "y": 133, "w": 96, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 10, "w": 96, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 573, "y": 135, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 653, "y": 242, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 665, "y": 152, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 161, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0048.png", + "frame": { "x": 374, "y": 220, "w": 93, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 10, "w": 93, "h": 89 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0049.png", + "frame": { "x": 832, "y": 275, "w": 89, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 89, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0050.png", + "frame": { "x": 282, "y": 169, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 9, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 191, "y": 132, "w": 91, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 91, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 71, "w": 98, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 8, "w": 98, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0053.png", + "frame": { "x": 829, "y": 0, "w": 97, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 6, "w": 97, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0054.png", + "frame": { "x": 92, "y": 222, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 90, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0055.png", + "frame": { "x": 926, "y": 0, "w": 89, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 89, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0056.png", + "frame": { "x": 90, "y": 313, "w": 88, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 5, "w": 88, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 251, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 6, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0058.png", + "frame": { "x": 743, "y": 271, "w": 89, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 4, "w": 89, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0059.png", + "frame": { "x": 98, "y": 132, "w": 93, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 5, "w": 93, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0060.png", + "frame": { "x": 182, "y": 223, "w": 93, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 7, "w": 93, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 793, "y": 92, "w": 97, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 97, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 476, "y": 135, "w": 97, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 9, "w": 97, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0063.png", + "frame": { "x": 560, "y": 225, "w": 93, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 7, "w": 93, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0064.png", + "frame": { "x": 467, "y": 221, "w": 93, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 93, "h": 89 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0065.png", + "frame": { "x": 275, "y": 259, "w": 89, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 89, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0066.png", + "frame": { "x": 921, "y": 275, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 87, "h": 93 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0067.png", + "frame": { "x": 536, "y": 313, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0068.png", + "frame": { "x": 182, "y": 311, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 84, "h": 96 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 341, "w": 80, "h": 97 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 0, "w": 80, "h": 97 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0070.png", + "frame": { "x": 619, "y": 332, "w": 81, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 2, "w": 81, "h": 96 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 364, "y": 309, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 450, "y": 310, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 86, "h": 94 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0073.png", + "frame": { "x": 757, "y": 179, "w": 90, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 90, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0074.png", + "frame": { "x": 847, "y": 183, "w": 90, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0075.png", + "frame": { "x": 890, "y": 92, "w": 92, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.9.2-x64", + "image": "249.png", + "format": "I8", + "size": { "w": 1015, "h": 438 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/249.png b/public/images/pokemon/back/249.png index e08ce361804..181c7076e5d 100644 Binary files a/public/images/pokemon/back/249.png and b/public/images/pokemon/back/249.png differ diff --git a/public/images/pokemon/back/shiny/249.json b/public/images/pokemon/back/shiny/249.json index 7512f163c15..7f126e8c62c 100644 --- a/public/images/pokemon/back/shiny/249.json +++ b/public/images/pokemon/back/shiny/249.json @@ -1,2540 +1,686 @@ -{ - "textures": [ - { - "image": "249.png", - "format": "RGBA8888", - "size": { - "w": 610, - "h": 610 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 36, - "w": 143, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 143, - "h": 64 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 35, - "w": 146, - "h": 65 - }, - "frame": { - "x": 143, - "y": 0, - "w": 146, - "h": 65 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 30, - "w": 132, - "h": 67 - }, - "frame": { - "x": 289, - "y": 0, - "w": 132, - "h": 67 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 28, - "w": 140, - "h": 68 - }, - "frame": { - "x": 421, - "y": 0, - "w": 140, - "h": 68 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 2, - "y": 30, - "w": 138, - "h": 70 - }, - "frame": { - "x": 0, - "y": 64, - "w": 138, - "h": 70 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 0, - "y": 30, - "w": 146, - "h": 70 - }, - "frame": { - "x": 138, - "y": 65, - "w": 146, - "h": 70 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 10, - "y": 28, - "w": 130, - "h": 70 - }, - "frame": { - "x": 284, - "y": 67, - "w": 130, - "h": 70 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 1, - "y": 26, - "w": 145, - "h": 73 - }, - "frame": { - "x": 414, - "y": 68, - "w": 145, - "h": 73 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 7, - "y": 13, - "w": 124, - "h": 82 - }, - "frame": { - "x": 0, - "y": 134, - "w": 124, - "h": 82 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 17, - "y": 11, - "w": 106, - "h": 87 - }, - "frame": { - "x": 124, - "y": 135, - "w": 106, - "h": 87 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 25, - "y": 5, - "w": 99, - "h": 88 - }, - "frame": { - "x": 230, - "y": 137, - "w": 99, - "h": 88 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 5, - "w": 99, - "h": 88 - }, - "frame": { - "x": 329, - "y": 141, - "w": 99, - "h": 88 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 6, - "w": 98, - "h": 89 - }, - "frame": { - "x": 428, - "y": 141, - "w": 98, - "h": 89 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 26, - "y": 0, - "w": 84, - "h": 97 - }, - "frame": { - "x": 526, - "y": 141, - "w": 84, - "h": 97 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 27, - "y": 4, - "w": 96, - "h": 89 - }, - "frame": { - "x": 0, - "y": 216, - "w": 96, - "h": 89 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 25, - "y": 4, - "w": 96, - "h": 89 - }, - "frame": { - "x": 96, - "y": 222, - "w": 96, - "h": 89 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 20, - "y": 7, - "w": 98, - "h": 90 - }, - "frame": { - "x": 192, - "y": 225, - "w": 98, - "h": 90 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 7, - "w": 95, - "h": 90 - }, - "frame": { - "x": 290, - "y": 229, - "w": 95, - "h": 90 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 7, - "w": 95, - "h": 90 - }, - "frame": { - "x": 290, - "y": 229, - "w": 95, - "h": 90 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 4, - "w": 95, - "h": 90 - }, - "frame": { - "x": 385, - "y": 230, - "w": 95, - "h": 90 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 4, - "w": 95, - "h": 91 - }, - "frame": { - "x": 480, - "y": 238, - "w": 95, - "h": 91 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 5, - "w": 95, - "h": 91 - }, - "frame": { - "x": 0, - "y": 305, - "w": 95, - "h": 91 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 6, - "w": 95, - "h": 91 - }, - "frame": { - "x": 95, - "y": 311, - "w": 95, - "h": 91 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 32, - "y": 2, - "w": 92, - "h": 91 - }, - "frame": { - "x": 190, - "y": 315, - "w": 92, - "h": 91 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 32, - "y": 2, - "w": 92, - "h": 91 - }, - "frame": { - "x": 190, - "y": 315, - "w": 92, - "h": 91 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 16, - "y": 5, - "w": 101, - "h": 91 - }, - "frame": { - "x": 282, - "y": 319, - "w": 101, - "h": 91 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 5, - "w": 94, - "h": 92 - }, - "frame": { - "x": 383, - "y": 320, - "w": 94, - "h": 92 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 16, - "y": 4, - "w": 100, - "h": 92 - }, - "frame": { - "x": 477, - "y": 329, - "w": 100, - "h": 92 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 94, - "h": 92 - }, - "frame": { - "x": 0, - "y": 396, - "w": 94, - "h": 92 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 29, - "y": 2, - "w": 91, - "h": 92 - }, - "frame": { - "x": 94, - "y": 402, - "w": 91, - "h": 92 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 29, - "y": 2, - "w": 91, - "h": 92 - }, - "frame": { - "x": 94, - "y": 402, - "w": 91, - "h": 92 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 2, - "w": 92, - "h": 92 - }, - "frame": { - "x": 185, - "y": 406, - "w": 92, - "h": 92 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 6, - "w": 96, - "h": 92 - }, - "frame": { - "x": 277, - "y": 410, - "w": 96, - "h": 92 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 3, - "w": 92, - "h": 93 - }, - "frame": { - "x": 373, - "y": 412, - "w": 92, - "h": 93 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 2, - "w": 92, - "h": 93 - }, - "frame": { - "x": 465, - "y": 421, - "w": 92, - "h": 93 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 4, - "w": 93, - "h": 94 - }, - "frame": { - "x": 0, - "y": 488, - "w": 93, - "h": 94 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 1, - "w": 90, - "h": 95 - }, - "frame": { - "x": 93, - "y": 494, - "w": 90, - "h": 95 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 1, - "w": 90, - "h": 95 - }, - "frame": { - "x": 93, - "y": 494, - "w": 90, - "h": 95 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 22, - "y": 3, - "w": 93, - "h": 95 - }, - "frame": { - "x": 183, - "y": 498, - "w": 93, - "h": 95 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 0, - "w": 86, - "h": 96 - }, - "frame": { - "x": 276, - "y": 502, - "w": 86, - "h": 96 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 0, - "w": 86, - "h": 96 - }, - "frame": { - "x": 276, - "y": 502, - "w": 86, - "h": 96 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 23, - "y": 1, - "w": 90, - "h": 96 - }, - "frame": { - "x": 362, - "y": 505, - "w": 90, - "h": 96 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 146, - "h": 100 - }, - "spriteSourceSize": { - "x": 24, - "y": 2, - "w": 90, - "h": 96 - }, - "frame": { - "x": 452, - "y": 514, - "w": 90, - "h": 96 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d7da4020739cd4d93722302e0d6f99c6:d519731f31735f11bbba940400858c46:25c89a8ec37b43392b53a70993acdff3$" - } +{ "frames": [ + { + "filename": "0001.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0002.png", + "frame": { "x": 690, "y": 66, "w": 103, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 14, "w": 103, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0003.png", + "frame": { "x": 554, "y": 0, "w": 136, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 33, "w": 136, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0004.png", + "frame": { "x": 143, "y": 69, "w": 141, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 40, "w": 141, "h": 63 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0005.png", + "frame": { "x": 409, "y": 0, "w": 145, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 38, "w": 145, "h": 65 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0006.png", + "frame": { "x": 143, "y": 0, "w": 144, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 33, "w": 144, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0007.png", + "frame": { "x": 0, "y": 0, "w": 143, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 30, "w": 143, "h": 71 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0008.png", + "frame": { "x": 409, "y": 65, "w": 131, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 131, "h": 68 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0009.png", + "frame": { "x": 540, "y": 69, "w": 134, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 33, "w": 134, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0010.png", + "frame": { "x": 690, "y": 0, "w": 139, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 32, "w": 139, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0011.png", + "frame": { "x": 287, "y": 0, "w": 122, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 122, "h": 81 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0012.png", + "frame": { "x": 380, "y": 133, "w": 96, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 10, "w": 96, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0013.png", + "frame": { "x": 573, "y": 135, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0014.png", + "frame": { "x": 653, "y": 242, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0015.png", + "frame": { "x": 665, "y": 152, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0016.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0017.png", + "frame": { "x": 690, "y": 66, "w": 103, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 14, "w": 103, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0018.png", + "frame": { "x": 554, "y": 0, "w": 136, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 33, "w": 136, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0019.png", + "frame": { "x": 143, "y": 69, "w": 141, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 40, "w": 141, "h": 63 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0020.png", + "frame": { "x": 409, "y": 0, "w": 145, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 38, "w": 145, "h": 65 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0021.png", + "frame": { "x": 143, "y": 0, "w": 144, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 33, "w": 144, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0022.png", + "frame": { "x": 0, "y": 0, "w": 143, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 30, "w": 143, "h": 71 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0023.png", + "frame": { "x": 409, "y": 65, "w": 131, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 131, "h": 68 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0024.png", + "frame": { "x": 540, "y": 69, "w": 134, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 33, "w": 134, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0025.png", + "frame": { "x": 690, "y": 0, "w": 139, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 32, "w": 139, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0026.png", + "frame": { "x": 287, "y": 0, "w": 122, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 122, "h": 81 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0027.png", + "frame": { "x": 380, "y": 133, "w": 96, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 10, "w": 96, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0028.png", + "frame": { "x": 573, "y": 135, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0029.png", + "frame": { "x": 653, "y": 242, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0030.png", + "frame": { "x": 665, "y": 152, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0031.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0032.png", + "frame": { "x": 690, "y": 66, "w": 103, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 18, "y": 14, "w": 103, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0033.png", + "frame": { "x": 554, "y": 0, "w": 136, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 3, "y": 33, "w": 136, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0034.png", + "frame": { "x": 143, "y": 69, "w": 141, "h": 63 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 40, "w": 141, "h": 63 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0035.png", + "frame": { "x": 409, "y": 0, "w": 145, "h": 65 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 38, "w": 145, "h": 65 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0036.png", + "frame": { "x": 143, "y": 0, "w": 144, "h": 69 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 1, "y": 33, "w": 144, "h": 69 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0037.png", + "frame": { "x": 0, "y": 0, "w": 143, "h": 71 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 2, "y": 30, "w": 143, "h": 71 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0038.png", + "frame": { "x": 409, "y": 65, "w": 131, "h": 68 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 32, "w": 131, "h": 68 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0039.png", + "frame": { "x": 540, "y": 69, "w": 134, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 33, "w": 134, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0040.png", + "frame": { "x": 690, "y": 0, "w": 139, "h": 66 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 0, "y": 32, "w": 139, "h": 66 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0041.png", + "frame": { "x": 287, "y": 0, "w": 122, "h": 81 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 8, "y": 16, "w": 122, "h": 81 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0042.png", + "frame": { "x": 380, "y": 133, "w": 96, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 10, "w": 96, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0043.png", + "frame": { "x": 573, "y": 135, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0044.png", + "frame": { "x": 653, "y": 242, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0045.png", + "frame": { "x": 665, "y": 152, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 100 + }, + { + "filename": "0046.png", + "frame": { "x": 284, "y": 81, "w": 96, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 21, "y": 11, "w": 96, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0047.png", + "frame": { "x": 0, "y": 161, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 9, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0048.png", + "frame": { "x": 374, "y": 220, "w": 93, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 10, "w": 93, "h": 89 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0049.png", + "frame": { "x": 832, "y": 275, "w": 89, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 89, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0050.png", + "frame": { "x": 282, "y": 169, "w": 92, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 9, "w": 92, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0051.png", + "frame": { "x": 191, "y": 132, "w": 91, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 8, "w": 91, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0052.png", + "frame": { "x": 0, "y": 71, "w": 98, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 8, "w": 98, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0053.png", + "frame": { "x": 829, "y": 0, "w": 97, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 17, "y": 6, "w": 97, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0054.png", + "frame": { "x": 92, "y": 222, "w": 90, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 6, "w": 90, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0055.png", + "frame": { "x": 926, "y": 0, "w": 89, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 5, "w": 89, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0056.png", + "frame": { "x": 90, "y": 313, "w": 88, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 5, "w": 88, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0057.png", + "frame": { "x": 0, "y": 251, "w": 90, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 30, "y": 6, "w": 90, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0058.png", + "frame": { "x": 743, "y": 271, "w": 89, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 33, "y": 4, "w": 89, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0059.png", + "frame": { "x": 98, "y": 132, "w": 93, "h": 90 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 31, "y": 5, "w": 93, "h": 90 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0060.png", + "frame": { "x": 182, "y": 223, "w": 93, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 28, "y": 7, "w": 93, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0061.png", + "frame": { "x": 793, "y": 92, "w": 97, "h": 87 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 8, "w": 97, "h": 87 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0062.png", + "frame": { "x": 476, "y": 135, "w": 97, "h": 86 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 9, "w": 97, "h": 86 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0063.png", + "frame": { "x": 560, "y": 225, "w": 93, "h": 88 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 7, "w": 93, "h": 88 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0064.png", + "frame": { "x": 467, "y": 221, "w": 93, "h": 89 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 93, "h": 89 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0065.png", + "frame": { "x": 275, "y": 259, "w": 89, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 89, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0066.png", + "frame": { "x": 921, "y": 275, "w": 87, "h": 93 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 87, "h": 93 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + }, + { + "filename": "0067.png", + "frame": { "x": 536, "y": 313, "w": 83, "h": 95 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 2, "w": 83, "h": 95 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0068.png", + "frame": { "x": 182, "y": 311, "w": 84, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 1, "w": 84, "h": 96 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0069.png", + "frame": { "x": 0, "y": 341, "w": 80, "h": 97 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 26, "y": 0, "w": 80, "h": 97 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0070.png", + "frame": { "x": 619, "y": 332, "w": 81, "h": 96 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 27, "y": 2, "w": 81, "h": 96 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0071.png", + "frame": { "x": 364, "y": 309, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 4, "w": 86, "h": 94 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 50 + }, + { + "filename": "0072.png", + "frame": { "x": 450, "y": 310, "w": 86, "h": 94 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 25, "y": 5, "w": 86, "h": 94 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 30 + }, + { + "filename": "0073.png", + "frame": { "x": 757, "y": 179, "w": 90, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 7, "w": 90, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 70 + }, + { + "filename": "0074.png", + "frame": { "x": 847, "y": 183, "w": 90, "h": 92 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 24, "y": 7, "w": 90, "h": 92 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 20 + }, + { + "filename": "0075.png", + "frame": { "x": 890, "y": 92, "w": 92, "h": 91 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 23, "y": 8, "w": 92, "h": 91 }, + "sourceSize": { "w": 146, "h": 103 }, + "duration": 80 + } + ], + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.9.2-x64", + "image": "249.png", + "format": "I8", + "size": { "w": 1015, "h": 438 }, + "scale": "1" + } } diff --git a/public/images/pokemon/back/shiny/249.png b/public/images/pokemon/back/shiny/249.png index bf37f724613..066a38999e0 100644 Binary files a/public/images/pokemon/back/shiny/249.png and b/public/images/pokemon/back/shiny/249.png differ diff --git a/public/locales b/public/locales index e07ab625f20..5ef993b95fa 160000 --- a/public/locales +++ b/public/locales @@ -1 +1 @@ -Subproject commit e07ab625f2080afe36b61fad291b0ec5eff4000c +Subproject commit 5ef993b95fa8248adc0fb7d9489baccf546bf8e3 diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 65ec6a844ee..f0aeb68e277 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1843,8 +1843,10 @@ export default class BattleScene extends SceneBase { this.currentBattle.battleScore += Math.ceil(scoreIncrease); } - getMaxExpLevel(ignoreLevelCap?: boolean): integer { - if (ignoreLevelCap) { + getMaxExpLevel(ignoreLevelCap: boolean = false): integer { + if (Overrides.LEVEL_CAP_OVERRIDE > 0) { + return Overrides.LEVEL_CAP_OVERRIDE; + } else if (ignoreLevelCap || Overrides.LEVEL_CAP_OVERRIDE < 0) { return Number.MAX_SAFE_INTEGER; } const waveIndex = Math.ceil((this.currentBattle?.waveIndex || 1) / 10) * 10; @@ -3388,7 +3390,8 @@ export default class BattleScene extends SceneBase { const previousEncounter = this.mysteryEncounterSaveData.encounteredEvents.length > 0 ? this.mysteryEncounterSaveData.encounteredEvents[this.mysteryEncounterSaveData.encounteredEvents.length - 1].type : null; - const biomeMysteryEncounters = mysteryEncountersByBiome.get(this.arena.biomeType) ?? []; + const disabledEncounters = this.eventManager.getEventMysteryEncountersDisabled(); + const biomeMysteryEncounters = mysteryEncountersByBiome.get(this.arena.biomeType)?.filter(enc => !disabledEncounters.includes(enc)) ?? []; // If no valid encounters exist at tier, checks next tier down, continuing until there are some encounters available while (availableEncounters.length === 0 && tier !== null) { availableEncounters = biomeMysteryEncounters @@ -3397,7 +3400,7 @@ export default class BattleScene extends SceneBase { if (!encounterCandidate) { return false; } - if (encounterCandidate.encounterTier !== tier) { + if (this.eventManager.getMysteryEncounterTierForEvent(encounterType, encounterCandidate.encounterTier) !== tier) { return false; } const disallowedGameModes = encounterCandidate.disallowedGameModes; diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts index 20179f4c618..550d9bd4f13 100644 --- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts +++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts @@ -4,6 +4,7 @@ import type { import { generateModifierType, generateModifierTypeOption, + getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, @@ -11,17 +12,15 @@ import { } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; import type { BerryModifierType, ModifierTypeOption } from "#app/modifier/modifier-type"; import { - getPartyLuckValue, ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds, } from "#app/modifier/modifier-type"; -import { randSeedInt, randSeedItem } from "#app/utils"; +import { randSeedInt } from "#app/utils"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; @@ -31,7 +30,6 @@ import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-enco import { getPokemonNameWithAffix } from "#app/messages"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { TrainerSlot } from "#app/data/trainer-config"; import { applyModifierTypeToPlayerPokemon, getEncounterPokemonLevelForWave, getHighestStatPlayerPokemon, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; import { BerryModifier } from "#app/modifier/modifier"; @@ -40,8 +38,6 @@ import { BerryType } from "#enums/berry-type"; import { PERMANENT_STATS, Stat } from "#enums/stat"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/data/pokemon-species"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/berriesAbound"; @@ -69,20 +65,12 @@ export const BerriesAboundEncounter: MysteryEncounter = // Calculate boss mon const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - let bossSpecies: PokemonSpecies; - if (globalScene.eventManager.isEventActive() && globalScene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) { - const eventEncounter = randSeedItem(globalScene.eventManager.activeEvent()!.uncommonBreedEncounters!); - const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, globalScene.gameMode); - bossSpecies = getPokemonSpecies( levelSpecies ); - } else { - bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true); - } - const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true); + const bossPokemon = getRandomEncounterSpecies(level, true); encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); const config: EnemyPartyConfig = { pokemonConfigs: [{ level: level, - species: bossSpecies, + species: bossPokemon.species, dataSource: new PokemonData(bossPokemon), isBoss: true }], diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index d710dffab8c..f382f130540 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -41,7 +41,7 @@ const OPTION_3_DISALLOWED_MODIFIERS = [ const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2; const doEventReward = () => { - const event_buff = globalScene.eventManager.activeEvent()?.delibirdyBuff ?? []; + const event_buff = globalScene.eventManager.getDelibirdyBuff(); if (event_buff.length > 0) { const candidates = event_buff.filter((c => { const mtype = generateModifierType(modifierTypes[c]); diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts index fc6f163010b..1667a15e7c9 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts @@ -2,6 +2,7 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/myst import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { + getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, @@ -9,12 +10,10 @@ import { } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; import { ModifierTier } from "#app/modifier/modifier-tier"; import type { ModifierTypeOption } from "#app/modifier/modifier-type"; import { - getPartyLuckValue, getPlayerModifierTypeOptions, ModifierPoolType, regenerateModifierPoolThresholds, @@ -26,16 +25,13 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { TrainerSlot } from "#app/data/trainer-config"; import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; import { BattlerTagType } from "#enums/battler-tag-type"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { randSeedInt, randSeedItem } from "#app/utils"; +import { randSeedInt } from "#app/utils"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/data/pokemon-species"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/fightOrFlight"; @@ -63,20 +59,12 @@ export const FightOrFlightEncounter: MysteryEncounter = // Calculate boss mon const level = getEncounterPokemonLevelForWave(STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - let bossSpecies: PokemonSpecies; - if (globalScene.eventManager.isEventActive() && globalScene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) { - const eventEncounter = randSeedItem(globalScene.eventManager.activeEvent()!.uncommonBreedEncounters!); - const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, globalScene.gameMode); - bossSpecies = getPokemonSpecies( levelSpecies ); - } else { - bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true); - } - const bossPokemon = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, true); + const bossPokemon = getRandomEncounterSpecies(level, true); encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender()); const config: EnemyPartyConfig = { pokemonConfigs: [{ level: level, - species: bossSpecies, + species: bossPokemon.species, dataSource: new PokemonData(bossPokemon), isBoss: true, tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts index 39297ab95b6..6e6381888f1 100644 --- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts +++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts @@ -1,10 +1,10 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon, PokemonMove } from "#app/field/pokemon"; -import { getPartyLuckValue } from "#app/modifier/modifier-type"; +import type { EnemyPokemon } from "#app/field/pokemon"; +import { PokemonMove } from "#app/field/pokemon"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -12,10 +12,9 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MoveRequirement, PersistentModifierRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { TrainerSlot } from "#app/data/trainer-config"; import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; -import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils"; +import { isNullOrUndefined, randSeedInt } from "#app/utils"; import type { Moves } from "#enums/moves"; import { BattlerIndex } from "#app/battle"; import { SelfStatusMove } from "#app/data/move"; @@ -26,8 +25,6 @@ import { BerryModifier } from "#app/modifier/modifier"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/data/pokemon-species"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/uncommonBreed"; @@ -56,15 +53,7 @@ export const UncommonBreedEncounter: MysteryEncounter = // Calculate boss mon // Level equal to 2 below highest party member const level = getHighestLevelPlayerPokemon(false, true).level - 2; - let species: PokemonSpecies; - if (globalScene.eventManager.isEventActive() && globalScene.eventManager.activeEvent()?.uncommonBreedEncounters && randSeedInt(2) === 1) { - const eventEncounter = randSeedItem(globalScene.eventManager.activeEvent()!.uncommonBreedEncounters!); - const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, eventEncounter.allowEvolution ?? false, true, globalScene.gameMode); - species = getPokemonSpecies( levelSpecies ); - } else { - species = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), true); - } - const pokemon = new EnemyPokemon(species, level, TrainerSlot.NONE, true); + const pokemon = getRandomEncounterSpecies(level, true, true); // Pokemon will always have one of its egg moves in its moveset const eggMoves = pokemon.getEggMoves(); @@ -92,7 +81,7 @@ export const UncommonBreedEncounter: MysteryEncounter = const config: EnemyPartyConfig = { pokemonConfigs: [{ level: level, - species: species, + species: pokemon.species, dataSource: new PokemonData(pokemon), isBoss: false, tags: [ BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON ], diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 8768fb06b37..a144b1ac5c5 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -6,9 +6,9 @@ import { AVERAGE_ENCOUNTERS_PER_RUN_TARGET, WEIGHT_INCREMENT_ON_SPAWN_MISS } fro import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import type { AiType, PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; -import { FieldPosition, PokemonMove, PokemonSummonData } from "#app/field/pokemon"; +import { EnemyPokemon, FieldPosition, PokemonMove, PokemonSummonData } from "#app/field/pokemon"; import type { CustomModifierSettings, ModifierType } from "#app/modifier/modifier-type"; -import { ModifierPoolType, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; +import { getPartyLuckValue, ModifierPoolType, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import { MysteryEncounterBattlePhase, MysteryEncounterBattleStartCleanupPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; import type PokemonData from "#app/system/pokemon-data"; import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; @@ -16,7 +16,7 @@ import type { PartyOption, PokemonSelectFilter } from "#app/ui/party-ui-handler" import { PartyUiMode } from "#app/ui/party-ui-handler"; import { Mode } from "#app/ui/ui"; import * as Utils from "#app/utils"; -import { isNullOrUndefined } from "#app/utils"; +import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils"; import type { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; import type { TrainerType } from "#enums/trainer-type"; @@ -45,6 +45,7 @@ import { PartyExpPhase } from "#app/phases/party-exp-phase"; import type { Variant } from "#app/data/variant"; import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; +import { getPokemonSpecies } from "#app/data/pokemon-species"; /** * Animates exclamation sprite over trainer's head at start of encounter @@ -874,6 +875,41 @@ export function handleMysteryEncounterTurnStartEffects(): boolean { return false; } +/** + * Helper function for encounters such as {@linkcode UncommonBreedEncounter} which call for a random species including event encounters. + * If the mon is from the event encounter list, it will do an extra shiny roll. + * @param level the level of the mon, which differs between MEs + * @param isBoss whether the mon should be a Boss + * @param rerollHidden whether the mon should get an extra roll for Hidden Ability + * @returns {@linkcode EnemyPokemon} for the requested encounter + */ +export function getRandomEncounterSpecies(level: number, isBoss: boolean = false, rerollHidden: boolean = false): EnemyPokemon { + let bossSpecies: PokemonSpecies; + let isEventEncounter = false; + const eventEncounters = globalScene.eventManager.getEventEncounters(); + + if (eventEncounters.length > 0 && randSeedInt(2) === 1) { + const eventEncounter = randSeedItem(eventEncounters); + const levelSpecies = getPokemonSpecies(eventEncounter.species).getWildSpeciesForLevel(level, !isNullOrUndefined(eventEncounter.blockEvolution), isBoss, globalScene.gameMode); + isEventEncounter = true; + bossSpecies = getPokemonSpecies(levelSpecies); + } else { + bossSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, level, 0, getPartyLuckValue(globalScene.getPlayerParty()), isBoss); + } + const ret = new EnemyPokemon(bossSpecies, level, TrainerSlot.NONE, isBoss); + + //Reroll shiny for event encounters + if (isEventEncounter && !ret.shiny) { + ret.trySetShinySeed(); + } + //Reroll hidden ability + if (rerollHidden && ret.abilityIndex !== 2 && ret.species.abilityHidden) { + ret.tryRerollHiddenAbilitySeed(); + } + + return ret; +} + /** * TODO: remove once encounter spawn rate is finalized * Just a helper function to calculate aggregate stats for MEs in a Classic run diff --git a/src/data/weather.ts b/src/data/weather.ts index d971f726543..7bba698f9b4 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -375,8 +375,8 @@ export function getRandomWeatherType(arena: Arena): WeatherType { break; } - if (arena.biomeType === Biome.TOWN && globalScene.eventManager.isEventActive() && (globalScene.eventManager.activeEvent()?.weather?.length ?? 0) > 0) { - globalScene.eventManager.activeEvent()?.weather?.map(w => weatherPool.push(w)); + if (arena.biomeType === Biome.TOWN && globalScene.eventManager.isEventActive()) { + globalScene.eventManager.getWeather()?.map(w => weatherPool.push(w)); } if (weatherPool.length > 1) { diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index a4b8603cbb0..731d5c8fbe7 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -10,7 +10,7 @@ import type Move from "#app/data/move"; import { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatStagesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatStageChangeAttr, RechargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr, MoveTarget, CombinedPledgeStabBoostAttr, VariableMoveTypeChartAttr } from "#app/data/move"; import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; import { default as PokemonSpecies, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER, getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; +import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; import { starterPassiveAbilities } from "#app/data/balance/passives"; import type { Constructor } from "#app/utils"; import { isNullOrUndefined, randSeedInt, type nil } from "#app/utils"; @@ -1955,7 +1955,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param thresholdOverride number that is divided by 2^16 (65536) to get the shiny chance, overrides {@linkcode shinyThreshold} if set (bypassing shiny rate modifiers such as Shiny Charm) * @returns true if the Pokemon has been set as a shiny, false otherwise */ - trySetShiny(thresholdOverride?: integer): boolean { + trySetShiny(thresholdOverride?: number): boolean { // Shiny Pokemon should not spawn in the end biome in endless if (globalScene.gameMode.isEndless && globalScene.arena.biomeType === Biome.END) { return false; @@ -1967,7 +1967,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const E = globalScene.gameData.trainerId ^ globalScene.gameData.secretId; const F = rand1 ^ rand2; - const shinyThreshold = new Utils.IntegerHolder(BASE_SHINY_CHANCE); + const shinyThreshold = new Utils.NumberHolder(BASE_SHINY_CHANCE); if (thresholdOverride === undefined) { if (globalScene.eventManager.isEventActive()) { shinyThreshold.value *= globalScene.eventManager.getShinyMultiplier(); @@ -2058,6 +2058,38 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } + /** + * Function that tries to set a Pokemon to have its hidden ability based on seed, if it exists. + * For manual use only, usually to roll a Pokemon's hidden ability chance a second time. + * + * The base hidden ability odds are {@linkcode BASE_HIDDEN_ABILITY_CHANCE} / `65536` + * @param thresholdOverride number that is divided by `2^16` (`65536`) to get the HA chance, overrides {@linkcode haThreshold} if set (bypassing HA rate modifiers such as Ability Charm) + * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Ability Charm to {@linkcode thresholdOverride} + * @returns `true` if the Pokemon has been set to have its hidden ability, `false` otherwise + */ + public tryRerollHiddenAbilitySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean { + if (!this.species.abilityHidden) { + return false; + } + const haThreshold = new Utils.NumberHolder(BASE_HIDDEN_ABILITY_CHANCE); + if (thresholdOverride === undefined || applyModifiersToOverride) { + if (thresholdOverride !== undefined && applyModifiersToOverride) { + haThreshold.value = thresholdOverride; + } + if (!this.hasTrainer()) { + globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, haThreshold); + } + } else { + haThreshold.value = thresholdOverride; + } + + if (randSeedInt(65536) < haThreshold.value) { + this.abilityIndex = 2; + } + + return this.abilityIndex === 2; + } + public generateFusionSpecies(forStarter?: boolean): void { const hiddenAbilityChance = new Utils.NumberHolder(BASE_HIDDEN_ABILITY_CHANCE); if (!this.hasTrainer()) { @@ -2391,8 +2423,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.battleInfo.toggleFlyout(visible); } - addExp(exp: integer) { - const maxExpLevel = globalScene.getMaxExpLevel(); + /** + * Adds experience to this PlayerPokemon, subject to wave based level caps. + * @param exp The amount of experience to add + * @param ignoreLevelCap Whether to ignore level caps when adding experience (defaults to false) + */ + addExp(exp: integer, ignoreLevelCap: boolean = false) { + const maxExpLevel = globalScene.getMaxExpLevel(ignoreLevelCap); const initialExp = this.exp; this.exp += exp; while (this.level < maxExpLevel && this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate)) { @@ -4323,10 +4360,7 @@ export class PlayerPokemon extends Pokemon { ].filter(d => !!d); const amount = new Utils.NumberHolder(friendship); globalScene.applyModifier(PokemonFriendshipBoosterModifier, true, this, amount); - let candyFriendshipMultiplier = CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER; - if (globalScene.eventManager.isEventActive()) { - candyFriendshipMultiplier *= globalScene.eventManager.getFriendshipMultiplier(); - } + const candyFriendshipMultiplier = globalScene.eventManager.getClassicFriendshipMultiplier(); const starterAmount = new Utils.NumberHolder(Math.floor(amount.value * (globalScene.gameMode.isClassic ? candyFriendshipMultiplier : 1) / (fusionStarterSpeciesId ? 2 : 1))); // Add friendship to this PlayerPokemon diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 40b6417f9f2..023f907a30d 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -246,9 +246,9 @@ export class LoadingScene extends SceneBase { } const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ]; if (lang && availableLangs.includes(lang)) { - this.loadImage("winter_holidays2024-event-" + lang, "events"); + this.loadImage("yearofthesnakeevent-" + lang, "events"); } else { - this.loadImage("winter_holidays2024-event-en", "events"); + this.loadImage("yearofthesnakeevent-en", "events"); } this.loadAtlas("statuses", ""); diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 9c844596abc..f531e96d641 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -2537,9 +2537,10 @@ export function getPartyLuckValue(party: Pokemon[]): integer { }, 0, globalScene.seed); return DailyLuck.value; } - const luck = Phaser.Math.Clamp(party.map(p => p.isAllowedInBattle() ? p.getLuck() : 0) + const eventSpecies = globalScene.eventManager.getEventLuckBoostedSpecies(); + const luck = Phaser.Math.Clamp(party.map(p => p.isAllowedInBattle() ? p.getLuck() + (eventSpecies.includes(p.species.speciesId) ? 1 : 0) : 0) .reduce((total: integer, value: integer) => total += value, 0), 0, 14); - return luck ?? 0; + return Math.min(globalScene.eventManager.getEventLuckBoost() + (luck ?? 0), 14); } export function getLuckString(luckValue: integer): string { diff --git a/src/overrides.ts b/src/overrides.ts index 1f8601b7659..4b1f4b280eb 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -63,8 +63,11 @@ class DefaultOverrides { readonly STARTING_WAVE_OVERRIDE: number = 0; readonly STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null; - /** Multiplies XP gained by this value including 0. Set to null to ignore the override */ + /** Multiplies XP gained by this value including 0. Set to null to ignore the override. */ readonly XP_MULTIPLIER_OVERRIDE: number | null = null; + /** Sets the level cap to this number during experience gain calculations. Set to `0` to disable override & use normal wave-based level caps, + or any negative number to set it to 9 quadrillion (effectively disabling it). */ + readonly LEVEL_CAP_OVERRIDE: number = 0; readonly NEVER_CRIT_OVERRIDE: boolean = false; /** default 1000 */ readonly STARTING_MONEY_OVERRIDE: number = 0; diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index 3fa7209751a..e2617f598da 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -39,7 +39,11 @@ export class TrainerVictoryPhase extends BattlePhase { // Validate Voucher for boss trainers if (vouchers.hasOwnProperty(TrainerType[trainerType])) { if (!globalScene.validateVoucher(vouchers[TrainerType[trainerType]]) && globalScene.currentBattle.trainer?.config.isBoss) { - globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType])); + if (globalScene.eventManager.getUpgradeUnlockedVouchers()) { + globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType])); + } else { + globalScene.unshiftPhase(new ModifierRewardPhase([ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType])); + } } } // Breeders in Space achievement diff --git a/src/test/phases/learn-move-phase.test.ts b/src/test/phases/learn-move-phase.test.ts index c4fa0e8bf45..3a3d111f551 100644 --- a/src/test/phases/learn-move-phase.test.ts +++ b/src/test/phases/learn-move-phase.test.ts @@ -4,6 +4,8 @@ import GameManager from "#test/utils/gameManager"; import { Species } from "#enums/species"; import { Moves } from "#enums/moves"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; +import { Mode } from "#app/ui/ui"; +import { Button } from "#app/enums/buttons"; describe("Learn Move Phase", () => { let phaserGame: Phaser.Game; @@ -26,7 +28,7 @@ describe("Learn Move Phase", () => { it("If Pokemon has less than 4 moves, its newest move will be added to the lowest empty index", async () => { game.override.moveset([ Moves.SPLASH ]); - await game.startBattle([ Species.BULBASAUR ]); + await game.classicMode.startBattle([ Species.BULBASAUR ]); const pokemon = game.scene.getPlayerPokemon()!; const newMovePos = pokemon?.getMoveset().length; game.move.select(Moves.SPLASH); @@ -36,12 +38,113 @@ describe("Learn Move Phase", () => { const levelReq = levelMove[0]; const levelMoveId = levelMove[1]; expect(pokemon.level).toBeGreaterThanOrEqual(levelReq); - expect(pokemon?.getMoveset()[newMovePos]?.moveId).toBe(levelMoveId); + expect(pokemon?.moveset[newMovePos]?.moveId).toBe(levelMoveId); + }); + + it("If a pokemon has 4 move slots filled, the chosen move will be deleted and replaced", async () => { + await game.classicMode.startBattle([ Species.BULBASAUR ]); + const bulbasaur = game.scene.getPlayerPokemon()!; + const prevMoveset = [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]; + const moveSlotNum = 3; + + game.move.changeMoveset(bulbasaur, prevMoveset); + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + + // queue up inputs to confirm dialog boxes + game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => { + game.scene.ui.processInput(Button.ACTION); + }); + game.onNextPrompt("LearnMovePhase", Mode.SUMMARY, () => { + for (let x = 0; x < moveSlotNum; x++) { + game.scene.ui.processInput(Button.DOWN); + } + game.scene.ui.processInput(Button.ACTION); + }); + await game.phaseInterceptor.to(LearnMovePhase); + + const levelMove = bulbasaur.getLevelMoves(5)[0]; + const levelReq = levelMove[0]; + const levelMoveId = levelMove[1]; + expect(bulbasaur.level).toBeGreaterThanOrEqual(levelReq); + // Check each of mr mime's moveslots to make sure the changed move (and ONLY the changed move) is different + bulbasaur.getMoveset().forEach((move, index) => { + const expectedMove: Moves = (index === moveSlotNum ? levelMoveId : prevMoveset[index]); + expect(move?.moveId).toBe(expectedMove); + }); + }); + + it("selecting the newly deleted move will reject it and keep old moveset", async () => { + await game.classicMode.startBattle([ Species.BULBASAUR ]); + const bulbasaur = game.scene.getPlayerPokemon()!; + const prevMoveset = [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]; + + game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + + // queue up inputs to confirm dialog boxes + game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => { + game.scene.ui.processInput(Button.ACTION); + }); + game.onNextPrompt("LearnMovePhase", Mode.SUMMARY, () => { + for (let x = 0; x < 4; x++) { + game.scene.ui.processInput(Button.DOWN); // moves down 4 times to the 5th move slot + } + game.scene.ui.processInput(Button.ACTION); + }); + game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => { + game.scene.ui.processInput(Button.ACTION); + }); + await game.phaseInterceptor.to(LearnMovePhase); + + const levelReq = bulbasaur.getLevelMoves(5)[0][0]; + expect(bulbasaur.level).toBeGreaterThanOrEqual(levelReq); + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual(prevMoveset); + }); + + it("macro should add moves in free slots normally", async () => { + await game.classicMode.startBattle([ Species.BULBASAUR ]); + const bulbasaur = game.scene.getPlayerPokemon()!; + + game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID ]); + game.move.select(Moves.SPLASH); + await game.move.learnMove(Moves.SACRED_FIRE, 0, 1); + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.SACRED_FIRE ]); + + }); + + it("macro should replace moves", async () => { + await game.classicMode.startBattle([ Species.BULBASAUR ]); + const bulbasaur = game.scene.getPlayerPokemon()!; + + game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + game.move.select(Moves.SPLASH); + await game.move.learnMove(Moves.SACRED_FIRE, 0, 1); + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.SACRED_FIRE, Moves.ACID, Moves.VINE_WHIP ]); + + }); + + it("macro should allow for cancelling move learning", async () => { + await game.classicMode.startBattle([ Species.BULBASAUR ]); + const bulbasaur = game.scene.getPlayerPokemon()!; + + game.move.changeMoveset(bulbasaur, [ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + game.move.select(Moves.SPLASH); + await game.move.learnMove(Moves.SACRED_FIRE, 0, 4); + expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP ]); + + }); + + it("macro works on off-field party members", async () => { + await game.classicMode.startBattle([ Species.BULBASAUR, Species.SQUIRTLE ]); + const squirtle = game.scene.getPlayerParty()[1]!; + + game.move.changeMoveset(squirtle, [ Moves.SPLASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL ]); + game.move.select(Moves.TACKLE); + await game.move.learnMove(Moves.SHELL_SMASH, 1, 0); + expect(squirtle.getMoveset().map(m => m?.moveId)).toEqual([ Moves.SHELL_SMASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL ]); + }); - /** - * Future Tests: - * If a Pokemon has four moves, the user can specify an old move to be forgotten and a new move will take its place. - * If a Pokemon has four moves, the user can reject the new move, keeping the moveset the same. - */ }); diff --git a/src/test/utils/helpers/moveHelper.ts b/src/test/utils/helpers/moveHelper.ts index 4b2069ee881..ad39755b556 100644 --- a/src/test/utils/helpers/moveHelper.ts +++ b/src/test/utils/helpers/moveHelper.ts @@ -1,8 +1,10 @@ import type { BattlerIndex } from "#app/battle"; +import { Button } from "#app/enums/buttons"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; import Overrides from "#app/overrides"; import type { CommandPhase } from "#app/phases/command-phase"; +import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Command } from "#app/ui/command-ui-handler"; import { Mode } from "#app/ui/ui"; @@ -75,9 +77,10 @@ export class MoveHelper extends GameManagerHelper { } /** - * Used when the normal moveset override can't be used (such as when it's necessary to check updated properties of the moveset). - * @param pokemon - The pokemon being modified - * @param moveset - The moveset to use + * Changes a pokemon's moveset to the given move(s). + * Used when the normal moveset override can't be used (such as when it's necessary to check or update properties of the moveset). + * @param pokemon - The {@linkcode Pokemon} being modified + * @param moveset - The {@linkcode Moves} (single or array) to change the Pokemon's moveset to */ public changeMoveset(pokemon: Pokemon, moveset: Moves | Moves[]): void { if (!Array.isArray(moveset)) { @@ -90,4 +93,40 @@ export class MoveHelper extends GameManagerHelper { const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", "); console.log(`Pokemon ${pokemon.species.name}'s moveset manually set to ${movesetStr} (=[${moveset.join(", ")}])!`); } + + /** + * Simulates learning a move for a player pokemon. + * @param move The {@linkcode Moves} being learnt + * @param partyIndex The party position of the {@linkcode PlayerPokemon} learning the move (defaults to 0) + * @param moveSlotIndex The INDEX (0-4) of the move slot to replace if existent move slots are full; + * defaults to 0 (first slot) and 4 aborts the procedure + * @returns a promise that resolves once the move has been successfully learnt + */ + public async learnMove(move: Moves | integer, partyIndex: integer = 0, moveSlotIndex: integer = 0) { + return new Promise(async (resolve, reject) => { + this.game.scene.pushPhase(new LearnMovePhase(partyIndex, move)); + + // if slots are full, queue up inputs to replace existing moves + if (this.game.scene.getPlayerParty()[partyIndex].moveset.filter(m => m).length === 4) { + this.game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => { + this.game.scene.ui.processInput(Button.ACTION); // "Should a move be forgotten and replaced with XXX?" + }); + this.game.onNextPrompt("LearnMovePhase", Mode.SUMMARY, () => { + for (let x = 0; x < (moveSlotIndex ?? 0); x++) { + this.game.scene.ui.processInput(Button.DOWN); // Scrolling in summary pane to move position + } + this.game.scene.ui.processInput(Button.ACTION); + if (moveSlotIndex === 4) { + this.game.onNextPrompt("LearnMovePhase", Mode.CONFIRM, () => { + this.game.scene.ui.processInput(Button.ACTION); // "Give up on learning XXX?" + }); + } + }); + } + + await this.game.phaseInterceptor.to(LearnMovePhase).catch(e => reject(e)); + resolve(); + }); + } + } diff --git a/src/test/utils/helpers/overridesHelper.ts b/src/test/utils/helpers/overridesHelper.ts index 9af811561b7..15815c96691 100644 --- a/src/test/utils/helpers/overridesHelper.ts +++ b/src/test/utils/helpers/overridesHelper.ts @@ -71,6 +71,26 @@ export class OverridesHelper extends GameManagerHelper { return this; } + /** + * Override the wave level cap + * @param cap the level cap value to set; 0 uses normal level caps and negative values + * disable it completely + * @returns `this` + */ + public levelCap(cap: number): this { + vi.spyOn(Overrides, "LEVEL_CAP_OVERRIDE", "get").mockReturnValue(cap); + let capStr: string; + if (cap > 0) { + capStr = `Level cap set to ${cap}!`; + } else if (cap < 0) { + capStr = "Level cap disabled!"; + } else { + capStr = "Level cap reset to default value for wave."; + } + this.log(capStr); + return this; + } + /** * Override the player (pokemon) starting held items * @param items the items to hold diff --git a/src/test/utils/mocks/mockTimedEventManager.ts b/src/test/utils/mocks/mockTimedEventManager.ts index b44729996a7..10f32fd4c8b 100644 --- a/src/test/utils/mocks/mockTimedEventManager.ts +++ b/src/test/utils/mocks/mockTimedEventManager.ts @@ -1,3 +1,4 @@ +import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "#app/data/balance/starters"; import { TimedEventManager } from "#app/timed-event-manager"; /** Mock TimedEventManager so that ongoing events don't impact tests */ @@ -8,8 +9,8 @@ export class MockTimedEventManager extends TimedEventManager { override isEventActive(): boolean { return false; } - override getFriendshipMultiplier(): number { - return 1; + override getClassicFriendshipMultiplier(): number { + return CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER; } override getShinyMultiplier(): number { return 1; diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts index 216900e8f58..8633460d98c 100644 --- a/src/timed-event-manager.ts +++ b/src/timed-event-manager.ts @@ -1,14 +1,19 @@ import { globalScene } from "#app/global-scene"; import { TextStyle, addTextObject } from "#app/ui/text"; import type { nil } from "#app/utils"; +import { isNullOrUndefined } from "#app/utils"; import i18next from "i18next"; import { Species } from "#enums/species"; import type { WeatherPoolEntry } from "#app/data/weather"; import { WeatherType } from "#enums/weather-type"; +import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "./data/balance/starters"; +import { MysteryEncounterType } from "./enums/mystery-encounter-type"; +import { MysteryEncounterTier } from "./enums/mystery-encounter-tier"; export enum EventType { SHINY, - NO_TIMER_DISPLAY + NO_TIMER_DISPLAY, + LUCK } interface EventBanner { @@ -21,19 +26,29 @@ interface EventBanner { interface EventEncounter { species: Species; - allowEvolution?: boolean; + blockEvolution?: boolean; +} + +interface EventMysteryEncounterTier { + mysteryEncounter: MysteryEncounterType; + tier?: MysteryEncounterTier; + disable?: boolean; } interface TimedEvent extends EventBanner { name: string; eventType: EventType; shinyMultiplier?: number; - friendshipMultiplier?: number; + classicFriendshipMultiplier?: number; + luckBoost?: number; + upgradeUnlockedVouchers?: boolean; startDate: Date; endDate: Date; - uncommonBreedEncounters?: EventEncounter[]; + eventEncounters?: EventEncounter[]; delibirdyBuff?: string[]; weather?: WeatherPoolEntry[]; + mysteryEncounterTierChanges?: EventMysteryEncounterTier[]; + luckBoostedSpecies?: Species[]; } const timedEvents: TimedEvent[] = [ @@ -41,36 +56,94 @@ const timedEvents: TimedEvent[] = [ name: "Winter Holiday Update", eventType: EventType.SHINY, shinyMultiplier: 2, - friendshipMultiplier: 1, + upgradeUnlockedVouchers: true, startDate: new Date(Date.UTC(2024, 11, 21, 0)), endDate: new Date(Date.UTC(2025, 0, 4, 0)), bannerKey: "winter_holidays2024-event-", scale: 0.21, availableLangs: [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ], - uncommonBreedEncounters: [ - { species: Species.GIMMIGHOUL }, + eventEncounters: [ + { species: Species.GIMMIGHOUL, blockEvolution: true }, { species: Species.DELIBIRD }, - { species: Species.STANTLER, allowEvolution: true }, - { species: Species.CYNDAQUIL, allowEvolution: true }, - { species: Species.PIPLUP, allowEvolution: true }, - { species: Species.CHESPIN, allowEvolution: true }, - { species: Species.BALTOY, allowEvolution: true }, - { species: Species.SNOVER, allowEvolution: true }, - { species: Species.CHINGLING, allowEvolution: true }, - { species: Species.LITWICK, allowEvolution: true }, - { species: Species.CUBCHOO, allowEvolution: true }, - { species: Species.SWIRLIX, allowEvolution: true }, - { species: Species.AMAURA, allowEvolution: true }, - { species: Species.MUDBRAY, allowEvolution: true }, - { species: Species.ROLYCOLY, allowEvolution: true }, - { species: Species.MILCERY, allowEvolution: true }, - { species: Species.SMOLIV, allowEvolution: true }, - { species: Species.ALOLA_VULPIX, allowEvolution: true }, - { species: Species.GALAR_DARUMAKA, allowEvolution: true }, + { species: Species.STANTLER }, + { species: Species.CYNDAQUIL }, + { species: Species.PIPLUP }, + { species: Species.CHESPIN }, + { species: Species.BALTOY }, + { species: Species.SNOVER }, + { species: Species.CHINGLING }, + { species: Species.LITWICK }, + { species: Species.CUBCHOO }, + { species: Species.SWIRLIX }, + { species: Species.AMAURA }, + { species: Species.MUDBRAY }, + { species: Species.ROLYCOLY }, + { species: Species.MILCERY }, + { species: Species.SMOLIV }, + { species: Species.ALOLA_VULPIX }, + { species: Species.GALAR_DARUMAKA }, { species: Species.IRON_BUNDLE } ], delibirdyBuff: [ "CATCHING_CHARM", "SHINY_CHARM", "ABILITY_CHARM", "EXP_CHARM", "SUPER_EXP_CHARM", "HEALING_CHARM" ], - weather: [{ weatherType: WeatherType.SNOW, weight: 1 }] + weather: [{ weatherType: WeatherType.SNOW, weight: 1 }], + mysteryEncounterTierChanges: [ + { mysteryEncounter: MysteryEncounterType.DELIBIRDY, tier: MysteryEncounterTier.COMMON }, + { mysteryEncounter: MysteryEncounterType.PART_TIMER, disable: true }, + { mysteryEncounter: MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, disable: true }, + { mysteryEncounter: MysteryEncounterType.FIELD_TRIP, disable: true }, + { mysteryEncounter: MysteryEncounterType.DEPARTMENT_STORE_SALE, disable: true } + ] + }, + { + name: "Year of the Snake", + eventType: EventType.LUCK, + luckBoost: 1, + startDate: new Date(Date.UTC(2025, 0, 29, 0)), + endDate: new Date(Date.UTC(2025, 1, 3, 0)), + bannerKey: "yearofthesnakeevent-", + scale: 0.21, + availableLangs: [], + eventEncounters: [ + { species: Species.EKANS }, + { species: Species.ONIX }, + { species: Species.DRATINI }, + { species: Species.CLEFFA }, + { species: Species.UMBREON }, + { species: Species.DUNSPARCE }, + { species: Species.TEDDIURSA }, + { species: Species.SEVIPER }, + { species: Species.LUNATONE }, + { species: Species.CHINGLING }, + { species: Species.SNIVY }, + { species: Species.DARUMAKA }, + { species: Species.DRAMPA }, + { species: Species.SILICOBRA }, + { species: Species.BLOODMOON_URSALUNA } + ], + luckBoostedSpecies: [ + Species.EKANS, Species.ARBOK, + Species.ONIX, Species.STEELIX, + Species.DRATINI, Species.DRAGONAIR, Species.DRAGONITE, + Species.CLEFFA, Species.CLEFAIRY, Species.CLEFABLE, + Species.UMBREON, + Species.DUNSPARCE, Species.DUDUNSPARCE, + Species.TEDDIURSA, Species.URSARING, Species.URSALUNA, + Species.SEVIPER, + Species.LUNATONE, + Species.RAYQUAZA, + Species.CHINGLING, Species.CHIMECHO, + Species.CRESSELIA, + Species.DARKRAI, + Species.SNIVY, Species.SERVINE, Species.SERPERIOR, + Species.DARUMAKA, Species.DARMANITAN, + Species.ZYGARDE, + Species.DRAMPA, + Species.LUNALA, + Species.BLACEPHALON, + Species.SILICOBRA, Species.SANDACONDA, + Species.ROARING_MOON, + Species.BLOODMOON_URSALUNA + ] } ]; @@ -97,16 +170,6 @@ export class TimedEventManager { return activeEvents.length > 0; } - getFriendshipMultiplier(): number { - let multiplier = 1; - const friendshipEvents = timedEvents.filter((te) => this.isActive(te)); - friendshipEvents.forEach((fe) => { - multiplier *= fe.friendshipMultiplier ?? 1; - }); - - return multiplier; - } - getShinyMultiplier(): number { let multiplier = 1; const shinyEvents = timedEvents.filter((te) => te.eventType === EventType.SHINY && this.isActive(te)); @@ -120,6 +183,120 @@ export class TimedEventManager { getEventBannerFilename(): string { return timedEvents.find((te: TimedEvent) => this.isActive(te))?.bannerKey ?? ""; } + + getEventEncounters(): EventEncounter[] { + const ret: EventEncounter[] = []; + timedEvents.filter((te) => this.isActive(te)).map((te) => { + if (!isNullOrUndefined(te.eventEncounters)) { + ret.push(...te.eventEncounters); + } + }); + return ret; + } + + /** + * For events that change the classic candy friendship multiplier + * @returns The highest classic friendship multiplier among the active events, or the default CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER + */ + getClassicFriendshipMultiplier(): number { + let multiplier = CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER; + const classicFriendshipEvents = timedEvents.filter((te) => this.isActive(te)); + classicFriendshipEvents.forEach((fe) => { + if (!isNullOrUndefined(fe.classicFriendshipMultiplier) && fe.classicFriendshipMultiplier > multiplier) { + multiplier = fe.classicFriendshipMultiplier; + } + }); + return multiplier; + } + + /** + * For events where defeated bosses (Gym Leaders, E4 etc) give out Voucher Plus even if they were defeated before + * @returns Whether vouchers should be upgraded + */ + getUpgradeUnlockedVouchers(): boolean { + return timedEvents.some((te) => this.isActive(te) && (te.upgradeUnlockedVouchers ?? false)); + } + + /** + * For events where Delibirdy gives extra items + * @returns list of ids of {@linkcode ModifierType}s that Delibirdy hands out as a bonus + */ + getDelibirdyBuff(): string[] { + const ret: string[] = []; + timedEvents.filter((te) => this.isActive(te)).map((te) => { + if (!isNullOrUndefined(te.delibirdyBuff)) { + ret.push(...te.delibirdyBuff); + } + }); + return ret; + } + + /** + * For events where there's a set weather for town biome (other biomes are hard) + * @returns Event weathers for town + */ + getWeather(): WeatherPoolEntry[] { + const ret: WeatherPoolEntry[] = []; + timedEvents.filter((te) => this.isActive(te)).map((te) => { + if (!isNullOrUndefined(te.weather)) { + ret.push(...te.weather); + } + }); + return ret; + } + + getAllMysteryEncounterChanges(): EventMysteryEncounterTier[] { + const ret: EventMysteryEncounterTier[] = []; + timedEvents.filter((te) => this.isActive(te)).map((te) => { + if (!isNullOrUndefined(te.mysteryEncounterTierChanges)) { + ret.push(...te.mysteryEncounterTierChanges); + } + }); + return ret; + } + + getEventMysteryEncountersDisabled(): MysteryEncounterType[] { + const ret: MysteryEncounterType[] = []; + timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)).map((te) => { + te.mysteryEncounterTierChanges?.map((metc) => { + if (metc.disable) { + ret.push(metc.mysteryEncounter); + } + }); + }); + return ret; + } + + getMysteryEncounterTierForEvent(encounterType: MysteryEncounterType, normal: MysteryEncounterTier): MysteryEncounterTier { + let ret = normal; + timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.mysteryEncounterTierChanges)).map((te) => { + te.mysteryEncounterTierChanges?.map((metc) => { + if (metc.mysteryEncounter === encounterType) { + ret = metc.tier ?? normal; + } + }); + }); + return ret; + } + + getEventLuckBoost(): number { + let ret = 0; + const luckEvents = timedEvents.filter((te) => this.isActive(te) && !isNullOrUndefined(te.luckBoost)); + luckEvents.forEach((le) => { + ret += le.luckBoost!; + }); + return ret; + } + + getEventLuckBoostedSpecies(): Species[] { + const ret: Species[] = []; + timedEvents.filter((te) => this.isActive(te)).map((te) => { + if (!isNullOrUndefined(te.luckBoostedSpecies)) { + ret.push(...te.luckBoostedSpecies.filter(s => !ret.includes(s))); + } + }); + return ret; + } } export class TimedEventDisplay extends Phaser.GameObjects.Container { diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index bb950f328e8..7ea8dbe7a4e 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -111,7 +111,7 @@ export default class MenuUiHandler extends MessageUiHandler { render() { const ui = this.getUi(); this.excludedMenus = () => [ - { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST ]}, + { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA ]}, { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]} ];