diff --git a/package.json b/package.json index 47408b13730..a8c20cc49ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pokemon-rogue-battle", "private": true, - "version": "1.0.3", + "version": "1.0.4", "type": "module", "scripts": { "start": "vite", diff --git a/public/images/pokemon/676-dandy.png b/public/images/pokemon/676-dandy.png index f7303f7ec04..738b9eaec07 100644 Binary files a/public/images/pokemon/676-dandy.png and b/public/images/pokemon/676-dandy.png differ diff --git a/public/images/pokemon/676-debutante.png b/public/images/pokemon/676-debutante.png index b33fb39c8a8..2be51b49d14 100644 Binary files a/public/images/pokemon/676-debutante.png and b/public/images/pokemon/676-debutante.png differ diff --git a/public/images/pokemon/676-diamond.png b/public/images/pokemon/676-diamond.png index 1bd0628a543..5662825df7d 100644 Binary files a/public/images/pokemon/676-diamond.png and b/public/images/pokemon/676-diamond.png differ diff --git a/public/images/pokemon/676-heart.png b/public/images/pokemon/676-heart.png index de6d3ebb7f6..2747c376bca 100644 Binary files a/public/images/pokemon/676-heart.png and b/public/images/pokemon/676-heart.png differ diff --git a/public/images/pokemon/676-kabuki.png b/public/images/pokemon/676-kabuki.png index c402730a5e8..1a9a2ad1689 100644 Binary files a/public/images/pokemon/676-kabuki.png and b/public/images/pokemon/676-kabuki.png differ diff --git a/public/images/pokemon/676-la-reine.png b/public/images/pokemon/676-la-reine.png index b9cf78ac6a6..1ca19430e66 100644 Binary files a/public/images/pokemon/676-la-reine.png and b/public/images/pokemon/676-la-reine.png differ diff --git a/public/images/pokemon/676-matron.png b/public/images/pokemon/676-matron.png index 4f88ee06a1e..0ea64fcd55e 100644 Binary files a/public/images/pokemon/676-matron.png and b/public/images/pokemon/676-matron.png differ diff --git a/public/images/pokemon/676-pharaoh.png b/public/images/pokemon/676-pharaoh.png index 6bcc2914010..d3019440c8a 100644 Binary files a/public/images/pokemon/676-pharaoh.png and b/public/images/pokemon/676-pharaoh.png differ diff --git a/public/images/pokemon/676-star.png b/public/images/pokemon/676-star.png index 540ba4a2dba..de93346cb74 100644 Binary files a/public/images/pokemon/676-star.png and b/public/images/pokemon/676-star.png differ diff --git a/public/images/pokemon/869-caramel-swirl.json b/public/images/pokemon/869-caramel-swirl.json new file mode 100644 index 00000000000..fb8f0afb857 --- /dev/null +++ b/public/images/pokemon/869-caramel-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-caramel-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:e565b3b962f894b4de5291159fced6f2:dec57ba4f1836b6834da2da4c98c442a:a9efacddd6da069c39eca521bf0c5c93$" + } +} diff --git a/public/images/pokemon/869-caramel-swirl.png b/public/images/pokemon/869-caramel-swirl.png new file mode 100644 index 00000000000..c6bf967942f Binary files /dev/null and b/public/images/pokemon/869-caramel-swirl.png differ diff --git a/public/images/pokemon/869-lemon-cream.json b/public/images/pokemon/869-lemon-cream.json new file mode 100644 index 00000000000..419a5c70a55 --- /dev/null +++ b/public/images/pokemon/869-lemon-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-lemon-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:8a99ba9bf3bfb93bba7c6010553d9e0e:b231a3962960f61ce4d970d95bde3f3c:0284bb2fb44231f3756d5e41407b29dc$" + } +} diff --git a/public/images/pokemon/869-lemon-cream.png b/public/images/pokemon/869-lemon-cream.png new file mode 100644 index 00000000000..88e238ece14 Binary files /dev/null and b/public/images/pokemon/869-lemon-cream.png differ diff --git a/public/images/pokemon/869-matcha-cream.json b/public/images/pokemon/869-matcha-cream.json new file mode 100644 index 00000000000..aa1e47ae680 --- /dev/null +++ b/public/images/pokemon/869-matcha-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-matcha-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:713d1a6f0fbac3236c31960e722f4425:29a82de035ed4f33426b4bb6943c4036:3607dee150b69bb8409f07bf4b436c27$" + } +} diff --git a/public/images/pokemon/869-matcha-cream.png b/public/images/pokemon/869-matcha-cream.png new file mode 100644 index 00000000000..5e282236ceb Binary files /dev/null and b/public/images/pokemon/869-matcha-cream.png differ diff --git a/public/images/pokemon/869-mint-cream.json b/public/images/pokemon/869-mint-cream.json new file mode 100644 index 00000000000..3d103861c5c --- /dev/null +++ b/public/images/pokemon/869-mint-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-mint-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:5deaa7830e8cbf001dce6c800a9e3da2:4c9255c2ad6d33fc00a90e447fb8a344:5a3d349b5aaedd43ed9c9acbc0c8652a$" + } +} diff --git a/public/images/pokemon/869-mint-cream.png b/public/images/pokemon/869-mint-cream.png new file mode 100644 index 00000000000..d67741eaa57 Binary files /dev/null and b/public/images/pokemon/869-mint-cream.png differ diff --git a/public/images/pokemon/869-rainbow-swirl.json b/public/images/pokemon/869-rainbow-swirl.json new file mode 100644 index 00000000000..b3ac889bcf4 --- /dev/null +++ b/public/images/pokemon/869-rainbow-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-rainbow-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:1a4d1bc0283fdcf9704523ff9c304937:8122f937b67cb25a772bdb63688456b7:5efb62c1b2c8ccb825172755b6a5956b$" + } +} diff --git a/public/images/pokemon/869-rainbow-swirl.png b/public/images/pokemon/869-rainbow-swirl.png new file mode 100644 index 00000000000..2e75b933316 Binary files /dev/null and b/public/images/pokemon/869-rainbow-swirl.png differ diff --git a/public/images/pokemon/869-ruby-cream.json b/public/images/pokemon/869-ruby-cream.json new file mode 100644 index 00000000000..f7af720c93b --- /dev/null +++ b/public/images/pokemon/869-ruby-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:e03bb56ed3208e982eb0bec819d53bf6:2c86ae79dcda2aeecdcf0c025c16d3c3:36b2afa6f1e593bd875572a5eaa54a8f$" + } +} diff --git a/public/images/pokemon/869-ruby-cream.png b/public/images/pokemon/869-ruby-cream.png new file mode 100644 index 00000000000..c699e109e08 Binary files /dev/null and b/public/images/pokemon/869-ruby-cream.png differ diff --git a/public/images/pokemon/869-ruby-swirl.json b/public/images/pokemon/869-ruby-swirl.json new file mode 100644 index 00000000000..8773a4a9b80 --- /dev/null +++ b/public/images/pokemon/869-ruby-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:3c79af909f9735d7ece0527b789506f2:0b973ea05d9bc875560323eb9df5efe3:ea7e9be6cfcdb9bb39d201b2ab117eae$" + } +} diff --git a/public/images/pokemon/869-ruby-swirl.png b/public/images/pokemon/869-ruby-swirl.png new file mode 100644 index 00000000000..3ce92c3e363 Binary files /dev/null and b/public/images/pokemon/869-ruby-swirl.png differ diff --git a/public/images/pokemon/869-salted-cream.json b/public/images/pokemon/869-salted-cream.json new file mode 100644 index 00000000000..b812a0c9823 --- /dev/null +++ b/public/images/pokemon/869-salted-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-salted-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.5, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 28, + "y": 20, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:bb169ea1db5dad0a39dcd54df8356c06:608e3745adcb907d1f382e251ad807f4:6e5c7cbfd1699b5560a39643a258e386$" + } +} diff --git a/public/images/pokemon/869-salted-cream.png b/public/images/pokemon/869-salted-cream.png new file mode 100644 index 00000000000..d8f495476fe Binary files /dev/null and b/public/images/pokemon/869-salted-cream.png differ diff --git a/public/images/pokemon/back/869-caramel-swirl.json b/public/images/pokemon/back/869-caramel-swirl.json new file mode 100644 index 00000000000..edf2b5a9a76 --- /dev/null +++ b/public/images/pokemon/back/869-caramel-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-caramel-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:2e4ddfde96ab312ce7d94315e5d95a9c:7f74b65259ec1e4bcb1f62f02643d8a7:a9efacddd6da069c39eca521bf0c5c93$" + } +} diff --git a/public/images/pokemon/back/869-caramel-swirl.png b/public/images/pokemon/back/869-caramel-swirl.png new file mode 100644 index 00000000000..74556910bc1 Binary files /dev/null and b/public/images/pokemon/back/869-caramel-swirl.png differ diff --git a/public/images/pokemon/back/869-lemon-cream.json b/public/images/pokemon/back/869-lemon-cream.json new file mode 100644 index 00000000000..7e8eb3f1f08 --- /dev/null +++ b/public/images/pokemon/back/869-lemon-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-lemon-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:003640cdcb017af6d6fb7cce7ae5e1df:4dc2b3e45490e0868ac99d9aa7102c07:0284bb2fb44231f3756d5e41407b29dc$" + } +} diff --git a/public/images/pokemon/back/869-lemon-cream.png b/public/images/pokemon/back/869-lemon-cream.png new file mode 100644 index 00000000000..749e7c7aa65 Binary files /dev/null and b/public/images/pokemon/back/869-lemon-cream.png differ diff --git a/public/images/pokemon/back/869-matcha-cream.json b/public/images/pokemon/back/869-matcha-cream.json new file mode 100644 index 00000000000..261272c0247 --- /dev/null +++ b/public/images/pokemon/back/869-matcha-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-matcha-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:78c1fa20bd0f496a72dacd28367a66ad:96033ef5b7aeeb9456771109824bd27d:3607dee150b69bb8409f07bf4b436c27$" + } +} diff --git a/public/images/pokemon/back/869-matcha-cream.png b/public/images/pokemon/back/869-matcha-cream.png new file mode 100644 index 00000000000..32570610f13 Binary files /dev/null and b/public/images/pokemon/back/869-matcha-cream.png differ diff --git a/public/images/pokemon/back/869-mint-cream.json b/public/images/pokemon/back/869-mint-cream.json new file mode 100644 index 00000000000..23db1b920ea --- /dev/null +++ b/public/images/pokemon/back/869-mint-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-mint-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:567b2cbeb4dd05e9ea75a9745678a661:daa4e8bd833c1f1b8fcef7664611a23f:5a3d349b5aaedd43ed9c9acbc0c8652a$" + } +} diff --git a/public/images/pokemon/back/869-mint-cream.png b/public/images/pokemon/back/869-mint-cream.png new file mode 100644 index 00000000000..ec1976d3568 Binary files /dev/null and b/public/images/pokemon/back/869-mint-cream.png differ diff --git a/public/images/pokemon/back/869-rainbow-swirl.json b/public/images/pokemon/back/869-rainbow-swirl.json new file mode 100644 index 00000000000..f19a4443388 --- /dev/null +++ b/public/images/pokemon/back/869-rainbow-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-rainbow-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:3be6ab13976cde5a336b4186625bf386:e472d87a989050125ac960a9e53d8c77:5efb62c1b2c8ccb825172755b6a5956b$" + } +} diff --git a/public/images/pokemon/back/869-rainbow-swirl.png b/public/images/pokemon/back/869-rainbow-swirl.png new file mode 100644 index 00000000000..5454202ef27 Binary files /dev/null and b/public/images/pokemon/back/869-rainbow-swirl.png differ diff --git a/public/images/pokemon/back/869-ruby-cream.json b/public/images/pokemon/back/869-ruby-cream.json new file mode 100644 index 00000000000..ac2e4e0fa1d --- /dev/null +++ b/public/images/pokemon/back/869-ruby-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:5e1a2e975f94fce84da322e45069c702:68247ca18f9dd3e2bc269dc772ad069d:36b2afa6f1e593bd875572a5eaa54a8f$" + } +} diff --git a/public/images/pokemon/back/869-ruby-cream.png b/public/images/pokemon/back/869-ruby-cream.png new file mode 100644 index 00000000000..00cbd472026 Binary files /dev/null and b/public/images/pokemon/back/869-ruby-cream.png differ diff --git a/public/images/pokemon/back/869-ruby-swirl.json b/public/images/pokemon/back/869-ruby-swirl.json new file mode 100644 index 00000000000..ac2d6213f18 --- /dev/null +++ b/public/images/pokemon/back/869-ruby-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:74597d1dd20480b7437d63ffff36fdc6:712fef9349381ad34ea1cf553353507e:ea7e9be6cfcdb9bb39d201b2ab117eae$" + } +} diff --git a/public/images/pokemon/back/869-ruby-swirl.png b/public/images/pokemon/back/869-ruby-swirl.png new file mode 100644 index 00000000000..96f91ba6c52 Binary files /dev/null and b/public/images/pokemon/back/869-ruby-swirl.png differ diff --git a/public/images/pokemon/back/869-salted-cream.json b/public/images/pokemon/back/869-salted-cream.json new file mode 100644 index 00000000000..995a0769f15 --- /dev/null +++ b/public/images/pokemon/back/869-salted-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-salted-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 0.333, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 96, + "h": 96 + }, + "spriteSourceSize": { + "x": 30, + "y": 20, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:e2389a610f198709cf6d31d9265f1dec:150abb49e4602321790850b291b4a7fb:6e5c7cbfd1699b5560a39643a258e386$" + } +} diff --git a/public/images/pokemon/back/869-salted-cream.png b/public/images/pokemon/back/869-salted-cream.png new file mode 100644 index 00000000000..7b81e6e7fa3 Binary files /dev/null and b/public/images/pokemon/back/869-salted-cream.png differ diff --git a/public/images/pokemon/back/shiny/869-caramel-swirl.json b/public/images/pokemon/back/shiny/869-caramel-swirl.json new file mode 100644 index 00000000000..c189169e6c0 --- /dev/null +++ b/public/images/pokemon/back/shiny/869-caramel-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-caramel-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-caramel-swirl.png b/public/images/pokemon/back/shiny/869-caramel-swirl.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-caramel-swirl.png differ diff --git a/public/images/pokemon/back/shiny/869-lemon-cream.json b/public/images/pokemon/back/shiny/869-lemon-cream.json new file mode 100644 index 00000000000..51ea7fa51ae --- /dev/null +++ b/public/images/pokemon/back/shiny/869-lemon-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-lemon-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-lemon-cream.png b/public/images/pokemon/back/shiny/869-lemon-cream.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-lemon-cream.png differ diff --git a/public/images/pokemon/back/shiny/869-matcha-cream.json b/public/images/pokemon/back/shiny/869-matcha-cream.json new file mode 100644 index 00000000000..344546032ff --- /dev/null +++ b/public/images/pokemon/back/shiny/869-matcha-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-matcha-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-matcha-cream.png b/public/images/pokemon/back/shiny/869-matcha-cream.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-matcha-cream.png differ diff --git a/public/images/pokemon/back/shiny/869-mint-cream.json b/public/images/pokemon/back/shiny/869-mint-cream.json new file mode 100644 index 00000000000..21eaa4e016c --- /dev/null +++ b/public/images/pokemon/back/shiny/869-mint-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-mint-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-mint-cream.png b/public/images/pokemon/back/shiny/869-mint-cream.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-mint-cream.png differ diff --git a/public/images/pokemon/back/shiny/869-rainbow-swirl.json b/public/images/pokemon/back/shiny/869-rainbow-swirl.json new file mode 100644 index 00000000000..cb5a4c26c96 --- /dev/null +++ b/public/images/pokemon/back/shiny/869-rainbow-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-rainbow-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-rainbow-swirl.png b/public/images/pokemon/back/shiny/869-rainbow-swirl.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-rainbow-swirl.png differ diff --git a/public/images/pokemon/back/shiny/869-ruby-cream.json b/public/images/pokemon/back/shiny/869-ruby-cream.json new file mode 100644 index 00000000000..bd3277d2dd4 --- /dev/null +++ b/public/images/pokemon/back/shiny/869-ruby-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-ruby-cream.png b/public/images/pokemon/back/shiny/869-ruby-cream.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-ruby-cream.png differ diff --git a/public/images/pokemon/back/shiny/869-ruby-swirl.json b/public/images/pokemon/back/shiny/869-ruby-swirl.json new file mode 100644 index 00000000000..8a487e00562 --- /dev/null +++ b/public/images/pokemon/back/shiny/869-ruby-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-ruby-swirl.png b/public/images/pokemon/back/shiny/869-ruby-swirl.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-ruby-swirl.png differ diff --git a/public/images/pokemon/back/shiny/869-salted-cream.json b/public/images/pokemon/back/shiny/869-salted-cream.json new file mode 100644 index 00000000000..e3aeb125b45 --- /dev/null +++ b/public/images/pokemon/back/shiny/869-salted-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-salted-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 36, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:9282a977590712360ae72153b51f6d19:8a8b13830aca0ac27048eddc715c72bd:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/back/shiny/869-salted-cream.png b/public/images/pokemon/back/shiny/869-salted-cream.png new file mode 100644 index 00000000000..5407d6e73de Binary files /dev/null and b/public/images/pokemon/back/shiny/869-salted-cream.png differ diff --git a/public/images/pokemon/icons/869s-caramel-swirl.png b/public/images/pokemon/icons/869s-caramel-swirl.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-caramel-swirl.png differ diff --git a/public/images/pokemon/icons/869s-lemon-cream.png b/public/images/pokemon/icons/869s-lemon-cream.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-lemon-cream.png differ diff --git a/public/images/pokemon/icons/869s-matcha-cream.png b/public/images/pokemon/icons/869s-matcha-cream.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-matcha-cream.png differ diff --git a/public/images/pokemon/icons/869s-mint-cream.png b/public/images/pokemon/icons/869s-mint-cream.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-mint-cream.png differ diff --git a/public/images/pokemon/icons/869s-rainbow-swirl.png b/public/images/pokemon/icons/869s-rainbow-swirl.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-rainbow-swirl.png differ diff --git a/public/images/pokemon/icons/869s-ruby-cream.png b/public/images/pokemon/icons/869s-ruby-cream.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-ruby-cream.png differ diff --git a/public/images/pokemon/icons/869s-ruby-swirl.png b/public/images/pokemon/icons/869s-ruby-swirl.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-ruby-swirl.png differ diff --git a/public/images/pokemon/icons/869s-salted-cream.png b/public/images/pokemon/icons/869s-salted-cream.png new file mode 100644 index 00000000000..32cb4cc7d56 Binary files /dev/null and b/public/images/pokemon/icons/869s-salted-cream.png differ diff --git a/public/images/pokemon/shiny/676-dandy.png b/public/images/pokemon/shiny/676-dandy.png index f7303f7ec04..738b9eaec07 100644 Binary files a/public/images/pokemon/shiny/676-dandy.png and b/public/images/pokemon/shiny/676-dandy.png differ diff --git a/public/images/pokemon/shiny/676-debutante.png b/public/images/pokemon/shiny/676-debutante.png index b33fb39c8a8..2be51b49d14 100644 Binary files a/public/images/pokemon/shiny/676-debutante.png and b/public/images/pokemon/shiny/676-debutante.png differ diff --git a/public/images/pokemon/shiny/676-diamond.png b/public/images/pokemon/shiny/676-diamond.png index 1bd0628a543..5662825df7d 100644 Binary files a/public/images/pokemon/shiny/676-diamond.png and b/public/images/pokemon/shiny/676-diamond.png differ diff --git a/public/images/pokemon/shiny/676-heart.png b/public/images/pokemon/shiny/676-heart.png index de6d3ebb7f6..2747c376bca 100644 Binary files a/public/images/pokemon/shiny/676-heart.png and b/public/images/pokemon/shiny/676-heart.png differ diff --git a/public/images/pokemon/shiny/676-kabuki.png b/public/images/pokemon/shiny/676-kabuki.png index c402730a5e8..1a9a2ad1689 100644 Binary files a/public/images/pokemon/shiny/676-kabuki.png and b/public/images/pokemon/shiny/676-kabuki.png differ diff --git a/public/images/pokemon/shiny/676-la-reine.png b/public/images/pokemon/shiny/676-la-reine.png index b9cf78ac6a6..1ca19430e66 100644 Binary files a/public/images/pokemon/shiny/676-la-reine.png and b/public/images/pokemon/shiny/676-la-reine.png differ diff --git a/public/images/pokemon/shiny/676-matron.png b/public/images/pokemon/shiny/676-matron.png index 4f88ee06a1e..0ea64fcd55e 100644 Binary files a/public/images/pokemon/shiny/676-matron.png and b/public/images/pokemon/shiny/676-matron.png differ diff --git a/public/images/pokemon/shiny/676-pharaoh.png b/public/images/pokemon/shiny/676-pharaoh.png index 6bcc2914010..d3019440c8a 100644 Binary files a/public/images/pokemon/shiny/676-pharaoh.png and b/public/images/pokemon/shiny/676-pharaoh.png differ diff --git a/public/images/pokemon/shiny/676-star.png b/public/images/pokemon/shiny/676-star.png index 540ba4a2dba..de93346cb74 100644 Binary files a/public/images/pokemon/shiny/676-star.png and b/public/images/pokemon/shiny/676-star.png differ diff --git a/public/images/pokemon/shiny/869-caramel-swirl.json b/public/images/pokemon/shiny/869-caramel-swirl.json new file mode 100644 index 00000000000..d08055197ee --- /dev/null +++ b/public/images/pokemon/shiny/869-caramel-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-caramel-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-caramel-swirl.png b/public/images/pokemon/shiny/869-caramel-swirl.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-caramel-swirl.png differ diff --git a/public/images/pokemon/shiny/869-lemon-cream.json b/public/images/pokemon/shiny/869-lemon-cream.json new file mode 100644 index 00000000000..1160af92907 --- /dev/null +++ b/public/images/pokemon/shiny/869-lemon-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-lemon-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-lemon-cream.png b/public/images/pokemon/shiny/869-lemon-cream.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-lemon-cream.png differ diff --git a/public/images/pokemon/shiny/869-matcha-cream.json b/public/images/pokemon/shiny/869-matcha-cream.json new file mode 100644 index 00000000000..149ee6e1077 --- /dev/null +++ b/public/images/pokemon/shiny/869-matcha-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-matcha-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-matcha-cream.png b/public/images/pokemon/shiny/869-matcha-cream.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-matcha-cream.png differ diff --git a/public/images/pokemon/shiny/869-mint-cream.json b/public/images/pokemon/shiny/869-mint-cream.json new file mode 100644 index 00000000000..aac46fcf4c1 --- /dev/null +++ b/public/images/pokemon/shiny/869-mint-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-mint-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-mint-cream.png b/public/images/pokemon/shiny/869-mint-cream.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-mint-cream.png differ diff --git a/public/images/pokemon/shiny/869-rainbow-swirl.json b/public/images/pokemon/shiny/869-rainbow-swirl.json new file mode 100644 index 00000000000..195e1077d76 --- /dev/null +++ b/public/images/pokemon/shiny/869-rainbow-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-rainbow-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-rainbow-swirl.png b/public/images/pokemon/shiny/869-rainbow-swirl.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-rainbow-swirl.png differ diff --git a/public/images/pokemon/shiny/869-ruby-cream.json b/public/images/pokemon/shiny/869-ruby-cream.json new file mode 100644 index 00000000000..1b2b9f59acc --- /dev/null +++ b/public/images/pokemon/shiny/869-ruby-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-ruby-cream.png b/public/images/pokemon/shiny/869-ruby-cream.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-ruby-cream.png differ diff --git a/public/images/pokemon/shiny/869-ruby-swirl.json b/public/images/pokemon/shiny/869-ruby-swirl.json new file mode 100644 index 00000000000..384a8d9f362 --- /dev/null +++ b/public/images/pokemon/shiny/869-ruby-swirl.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-ruby-swirl.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-ruby-swirl.png b/public/images/pokemon/shiny/869-ruby-swirl.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-ruby-swirl.png differ diff --git a/public/images/pokemon/shiny/869-salted-cream.json b/public/images/pokemon/shiny/869-salted-cream.json new file mode 100644 index 00000000000..b3e92c77f8c --- /dev/null +++ b/public/images/pokemon/shiny/869-salted-cream.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "869-salted-cream.png", + "format": "RGBA8888", + "size": { + "w": 55, + "h": 55 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 39, + "h": 55 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 55 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:05eade73b3ac133b2b6bfabb37d329b4:51719e2b4400ad80a2715f69594d3317:18cea997ef38e1531596f96f8db4f25e$" + } +} diff --git a/public/images/pokemon/shiny/869-salted-cream.png b/public/images/pokemon/shiny/869-salted-cream.png new file mode 100644 index 00000000000..803686aed5d Binary files /dev/null and b/public/images/pokemon/shiny/869-salted-cream.png differ diff --git a/public/images/pokemon_icons_8.json b/public/images/pokemon_icons_8.json index 20f95930bed..430d114ff91 100644 --- a/public/images/pokemon_icons_8.json +++ b/public/images/pokemon_icons_8.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_8.png", "format": "RGBA8888", "size": { - "w": 251, - "h": 796 + "w": 254, + "h": 798 }, "scale": 1, "frames": [ @@ -282,27 +282,6 @@ "h": 24 } }, - { - "filename": "834", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 34, - "h": 23 - }, - "frame": { - "x": 217, - "y": 0, - "w": 34, - "h": 23 - } - }, { "filename": "815-gigantamax", "rotated": false, @@ -660,48 +639,6 @@ "h": 28 } }, - { - "filename": "834s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 34, - "h": 23 - }, - "frame": { - "x": 217, - "y": 23, - "w": 34, - "h": 23 - } - }, - { - "filename": "4083s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 38, - "h": 24 - }, - "frame": { - "x": 179, - "y": 24, - "w": 38, - "h": 24 - } - }, { "filename": "905-incarnate", "rotated": false, @@ -849,6 +786,27 @@ "h": 27 } }, + { + "filename": "834", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 3, + "y": 3, + "w": 34, + "h": 23 + }, + "frame": { + "x": 217, + "y": 0, + "w": 34, + "h": 23 + } + }, { "filename": "864", "rotated": false, @@ -871,7 +829,7 @@ } }, { - "filename": "864s", + "filename": "4083s", "rotated": false, "trimmed": true, "sourceSize": { @@ -879,20 +837,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 30, - "h": 27 + "x": 1, + "y": 3, + "w": 38, + "h": 24 }, "frame": { "x": 34, "y": 117, - "w": 30, - "h": 27 + "w": 38, + "h": 24 } }, { - "filename": "879-gigantamax", + "filename": "834s", "rotated": false, "trimmed": true, "sourceSize": { @@ -900,457 +858,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 31, - "y": 144, - "w": 27, - "h": 30 - } - }, - { - "filename": "879s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 31, - "y": 174, - "w": 27, - "h": 30 - } - }, - { - "filename": "884-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 30, - "y": 204, - "w": 27, - "h": 30 - } - }, - { - "filename": "884s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 - }, - "frame": { - "x": 30, - "y": 234, - "w": 27, - "h": 30 - } - }, - { - "filename": "861-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 264, - "w": 26, - "h": 30 - } - }, - { - "filename": "861s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 294, - "w": 26, - "h": 30 - } - }, - { - "filename": "898-shadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 324, - "w": 26, - "h": 30 - } - }, - { - "filename": "898s-shadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 30, - "y": 354, - "w": 26, - "h": 30 - } - }, - { - "filename": "839-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 30, - "y": 384, - "w": 25, - "h": 30 - } - }, - { - "filename": "839s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 30, - "y": 414, - "w": 25, - "h": 30 - } - }, - { - "filename": "4555", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 29, - "y": 444, - "w": 25, - "h": 30 - } - }, - { - "filename": "4555s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 29, - "y": 474, - "w": 25, - "h": 30 - } - }, - { - "filename": "898-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 29, - "y": 504, - "w": 24, - "h": 29 - } - }, - { - "filename": "898s-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 24, - "h": 29 - }, - "frame": { - "x": 29, - "y": 533, - "w": 24, - "h": 29 - } - }, - { - "filename": "841-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 32, - "y": 562, - "w": 21, - "h": 30 - } - }, - { - "filename": "841s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 32, - "y": 592, - "w": 21, - "h": 30 - } - }, - { - "filename": "842-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 32, - "y": 622, - "w": 21, - "h": 30 - } - }, - { - "filename": "845", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 32, - "y": 652, - "w": 24, - "h": 26 - } - }, - { - "filename": "892-gigantamax-single", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 23, - "h": 29 - }, - "frame": { - "x": 33, - "y": 678, - "w": 23, - "h": 29 - } - }, - { - "filename": "4110", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 28 - }, - "frame": { - "x": 31, - "y": 707, - "w": 29, - "h": 28 - } - }, - { - "filename": "826-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, + "x": 3, "y": 3, - "w": 30, - "h": 25 + "w": 34, + "h": 23 }, "frame": { - "x": 31, - "y": 735, - "w": 30, - "h": 25 - } - }, - { - "filename": "834-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 30, - "y": 760, - "w": 29, - "h": 27 + "x": 179, + "y": 24, + "w": 34, + "h": 23 } }, { @@ -1369,7 +886,7 @@ }, "frame": { "x": 178, - "y": 48, + "y": 47, "w": 33, "h": 24 } @@ -1411,7 +928,7 @@ }, "frame": { "x": 178, - "y": 72, + "y": 71, "w": 33, "h": 24 } @@ -1438,7 +955,7 @@ } }, { - "filename": "4110s", + "filename": "864s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1448,14 +965,14 @@ "spriteSourceSize": { "x": 5, "y": 1, - "w": 29, - "h": 28 + "w": 30, + "h": 27 }, "frame": { "x": 70, "y": 80, - "w": 29, - "h": 28 + "w": 30, + "h": 27 } }, { @@ -1480,7 +997,7 @@ } }, { - "filename": "834s-gigantamax", + "filename": "887", "rotated": false, "trimmed": true, "sourceSize": { @@ -1489,14 +1006,329 @@ }, "spriteSourceSize": { "x": 5, - "y": 1, - "w": 29, - "h": 27 + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 100, + "y": 81, + "w": 30, + "h": 26 + } + }, + { + "filename": "879-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 72, + "y": 107, + "w": 27, + "h": 30 + } + }, + { + "filename": "879s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 }, "frame": { "x": 99, + "y": 107, + "w": 27, + "h": 30 + } + }, + { + "filename": "813", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 2, + "w": 17, + "h": 26 + }, + "frame": { + "x": 130, "y": 81, - "w": 29, + "w": 17, + "h": 26 + } + }, + { + "filename": "870", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 3, + "w": 31, + "h": 23 + }, + "frame": { + "x": 147, + "y": 80, + "w": 31, + "h": 23 + } + }, + { + "filename": "839-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 126, + "y": 107, + "w": 25, + "h": 30 + } + }, + { + "filename": "884-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 151, + "y": 103, + "w": 27, + "h": 30 + } + }, + { + "filename": "884s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 0, + "w": 27, + "h": 30 + }, + "frame": { + "x": 178, + "y": 95, + "w": 27, + "h": 30 + } + }, + { + "filename": "839s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 205, + "y": 95, + "w": 25, + "h": 30 + } + }, + { + "filename": "898-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 230, + "y": 23, + "w": 24, + "h": 29 + } + }, + { + "filename": "869-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 0, + "w": 17, + "h": 30 + }, + "frame": { + "x": 213, + "y": 24, + "w": 17, + "h": 30 + } + }, + { + "filename": "898s-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 29 + }, + "frame": { + "x": 230, + "y": 52, + "w": 24, + "h": 29 + } + }, + { + "filename": "876", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 24 + }, + "frame": { + "x": 211, + "y": 54, + "w": 19, + "h": 24 + } + }, + { + "filename": "6157", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 230, + "y": 81, + "w": 24, + "h": 27 + } + }, + { + "filename": "852", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 211, + "y": 78, + "w": 19, + "h": 17 + } + }, + { + "filename": "6157s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 230, + "y": 108, + "w": 24, "h": 27 } }, @@ -1515,14 +1347,14 @@ "h": 24 }, "frame": { - "x": 70, - "y": 108, + "x": 178, + "y": 125, "w": 32, "h": 24 } }, { - "filename": "812", + "filename": "863", "rotated": false, "trimmed": true, "sourceSize": { @@ -1530,251 +1362,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 10, "y": 3, - "w": 26, + "w": 20, "h": 24 }, "frame": { - "x": 102, - "y": 108, - "w": 26, + "x": 210, + "y": 125, + "w": 20, "h": 24 } }, { - "filename": "842s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 0, - "w": 21, - "h": 30 - }, - "frame": { - "x": 128, - "y": 81, - "w": 21, - "h": 30 - } - }, - { - "filename": "845-gulping", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 149, - "y": 80, - "w": 29, - "h": 27 - } - }, - { - "filename": "811", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 24 - }, - "frame": { - "x": 128, - "y": 111, - "w": 22, - "h": 24 - } - }, - { - "filename": "845s-gulping", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 29, - "h": 27 - }, - "frame": { - "x": 150, - "y": 107, - "w": 29, - "h": 27 - } - }, - { - "filename": "887", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 30, - "h": 26 - }, - "frame": { - "x": 179, - "y": 96, - "w": 30, - "h": 26 - } - }, - { - "filename": "826s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 30, - "h": 25 - }, - "frame": { - "x": 179, - "y": 122, - "w": 30, - "h": 25 - } - }, - { - "filename": "870", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 31, - "h": 23 - }, - "frame": { - "x": 64, - "y": 132, - "w": 31, - "h": 23 - } - }, - { - "filename": "870s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 3, - "w": 31, - "h": 23 - }, - "frame": { - "x": 95, - "y": 132, - "w": 31, - "h": 23 - } - }, - { - "filename": "887s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 30, - "h": 26 - }, - "frame": { - "x": 58, - "y": 155, - "w": 30, - "h": 26 - } - }, - { - "filename": "895", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 88, - "y": 155, - "w": 28, - "h": 26 - } - }, - { - "filename": "6503", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 31, - "h": 23 - }, - "frame": { - "x": 58, - "y": 181, - "w": 31, - "h": 23 - } - }, - { - "filename": "905-therian", + "filename": "845", "rotated": false, "trimmed": true, "sourceSize": { @@ -1783,36 +1384,15 @@ }, "spriteSourceSize": { "x": 8, - "y": 1, - "w": 28, - "h": 27 + "y": 2, + "w": 24, + "h": 26 }, "frame": { - "x": 57, - "y": 204, - "w": 28, - "h": 27 - } - }, - { - "filename": "905s-therian", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 28, - "h": 27 - }, - "frame": { - "x": 57, - "y": 231, - "w": 28, - "h": 27 + "x": 230, + "y": 135, + "w": 24, + "h": 26 } }, { @@ -1830,14 +1410,14 @@ "h": 24 }, "frame": { - "x": 89, - "y": 181, + "x": 151, + "y": 133, "w": 27, "h": 24 } }, { - "filename": "6059", + "filename": "870s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1845,146 +1425,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 85, - "y": 205, - "w": 28, - "h": 27 - } - }, - { - "filename": "895s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 26 - }, - "frame": { - "x": 85, - "y": 232, - "w": 28, - "h": 26 - } - }, - { - "filename": "812s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, + "x": 4, "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 126, - "y": 135, - "w": 26, - "h": 24 - } - }, - { - "filename": "823s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 152, - "y": 134, - "w": 27, - "h": 24 - } - }, - { - "filename": "6059s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 116, - "y": 159, - "w": 28, - "h": 27 - } - }, - { - "filename": "888", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 116, - "y": 186, - "w": 28, - "h": 23 - } - }, - { - "filename": "6503s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, "w": 31, "h": 23 }, "frame": { - "x": 113, - "y": 209, + "x": 178, + "y": 149, "w": 31, "h": 23 } }, { - "filename": "894", + "filename": "814", "rotated": false, "trimmed": true, "sourceSize": { @@ -1992,20 +1446,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, + "x": 9, "y": 3, - "w": 30, + "w": 21, "h": 23 }, "frame": { - "x": 113, - "y": 232, - "w": 30, + "x": 209, + "y": 149, + "w": 21, "h": 23 } }, { - "filename": "894s", + "filename": "845s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2013,100 +1467,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 30, - "h": 23 + "x": 8, + "y": 2, + "w": 24, + "h": 26 }, "frame": { - "x": 179, - "y": 147, - "w": 30, - "h": 23 - } - }, - { - "filename": "828", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 152, - "y": 158, - "w": 27, - "h": 24 - } - }, - { - "filename": "889", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 26, - "h": 27 - }, - "frame": { - "x": 144, - "y": 182, - "w": 26, - "h": 27 - } - }, - { - "filename": "828s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 144, - "y": 209, - "w": 27, - "h": 24 - } - }, - { - "filename": "888s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 143, - "y": 233, - "w": 28, - "h": 23 + "x": 230, + "y": 161, + "w": 24, + "h": 26 } }, { @@ -2124,8 +1494,8 @@ "h": 22 }, "frame": { - "x": 179, - "y": 170, + "x": 72, + "y": 137, "w": 31, "h": 22 } @@ -2145,14 +1515,287 @@ "h": 22 }, "frame": { - "x": 57, - "y": 258, + "x": 103, + "y": 137, "w": 31, "h": 22 } }, { - "filename": "889s", + "filename": "813s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 2, + "w": 17, + "h": 26 + }, + "frame": { + "x": 134, + "y": 137, + "w": 17, + "h": 26 + } + }, + { + "filename": "823s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 151, + "y": 157, + "w": 27, + "h": 24 + } + }, + { + "filename": "6503", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 31, + "h": 23 + }, + "frame": { + "x": 178, + "y": 172, + "w": 31, + "h": 23 + } + }, + { + "filename": "814s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 21, + "h": 23 + }, + "frame": { + "x": 209, + "y": 172, + "w": 21, + "h": 23 + } + }, + { + "filename": "892-gigantamax-rapid", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 230, + "y": 187, + "w": 24, + "h": 26 + } + }, + { + "filename": "6503s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 31, + "h": 23 + }, + "frame": { + "x": 34, + "y": 141, + "w": 31, + "h": 23 + } + }, + { + "filename": "4110", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 28 + }, + "frame": { + "x": 31, + "y": 164, + "w": 29, + "h": 28 + } + }, + { + "filename": "826-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 25 + }, + "frame": { + "x": 31, + "y": 192, + "w": 30, + "h": 25 + } + }, + { + "filename": "4110s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 28 + }, + "frame": { + "x": 30, + "y": 217, + "w": 29, + "h": 28 + } + }, + { + "filename": "834-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 30, + "y": 245, + "w": 29, + "h": 27 + } + }, + { + "filename": "834s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 30, + "y": 272, + "w": 29, + "h": 27 + } + }, + { + "filename": "845-gulping", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 30, + "y": 299, + "w": 29, + "h": 27 + } + }, + { + "filename": "845s-gulping", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 29, + "h": 27 + }, + "frame": { + "x": 30, + "y": 326, + "w": 29, + "h": 27 + } + }, + { + "filename": "861-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -2161,15 +1804,57 @@ }, "spriteSourceSize": { "x": 7, - "y": 1, + "y": 0, "w": 26, - "h": 27 + "h": 30 }, "frame": { - "x": 56, - "y": 280, + "x": 30, + "y": 353, "w": 26, - "h": 27 + "h": 30 + } + }, + { + "filename": "861s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 30, + "y": 383, + "w": 26, + "h": 30 + } + }, + { + "filename": "898-shadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 30, + "y": 413, + "w": 26, + "h": 30 } }, { @@ -2187,14 +1872,14 @@ "h": 28 }, "frame": { - "x": 56, - "y": 307, + "x": 60, + "y": 164, "w": 25, "h": 28 } }, { - "filename": "4555s-zen", + "filename": "887s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2202,16 +1887,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, - "h": 28 + "x": 5, + "y": 2, + "w": 30, + "h": 26 }, "frame": { - "x": 56, - "y": 335, - "w": 25, - "h": 28 + "x": 85, + "y": 159, + "w": 30, + "h": 26 } }, { @@ -2229,14 +1914,182 @@ "h": 27 }, "frame": { - "x": 88, - "y": 258, + "x": 61, + "y": 192, "w": 25, "h": 27 } }, { - "filename": "904", + "filename": "898s-shadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 59, + "y": 219, + "w": 26, + "h": 30 + } + }, + { + "filename": "4555", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 59, + "y": 249, + "w": 25, + "h": 30 + } + }, + { + "filename": "4555s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 59, + "y": 279, + "w": 25, + "h": 30 + } + }, + { + "filename": "4555s-zen", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 25, + "h": 28 + }, + "frame": { + "x": 59, + "y": 309, + "w": 25, + "h": 28 + } + }, + { + "filename": "905-therian", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 28, + "h": 27 + }, + "frame": { + "x": 86, + "y": 185, + "w": 28, + "h": 27 + } + }, + { + "filename": "876s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 24 + }, + "frame": { + "x": 115, + "y": 159, + "w": 19, + "h": 24 + } + }, + { + "filename": "859", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 20 + }, + "frame": { + "x": 134, + "y": 163, + "w": 17, + "h": 20 + } + }, + { + "filename": "828", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 151, + "y": 181, + "w": 27, + "h": 24 + } + }, + { + "filename": "812", "rotated": false, "trimmed": true, "sourceSize": { @@ -2246,18 +2099,249 @@ "spriteSourceSize": { "x": 7, "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 59, + "y": 337, + "w": 26, + "h": 24 + } + }, + { + "filename": "905s-therian", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, "w": 28, + "h": 27 + }, + "frame": { + "x": 56, + "y": 361, + "w": 28, + "h": 27 + } + }, + { + "filename": "6059", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 56, + "y": 388, + "w": 28, + "h": 27 + } + }, + { + "filename": "6059s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 56, + "y": 415, + "w": 28, + "h": 27 + } + }, + { + "filename": "826s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, "h": 25 }, "frame": { - "x": 113, - "y": 255, - "w": 28, + "x": 178, + "y": 195, + "w": 30, "h": 25 } }, { - "filename": "904s", + "filename": "818", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 208, + "y": 195, + "w": 22, + "h": 27 + } + }, + { + "filename": "892s-gigantamax-rapid", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 230, + "y": 213, + "w": 24, + "h": 26 + } + }, + { + "filename": "888", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 86, + "y": 212, + "w": 28, + "h": 23 + } + }, + { + "filename": "894", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 3, + "w": 30, + "h": 23 + }, + "frame": { + "x": 85, + "y": 235, + "w": 30, + "h": 23 + } + }, + { + "filename": "895", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 84, + "y": 258, + "w": 28, + "h": 26 + } + }, + { + "filename": "895s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 26 + }, + "frame": { + "x": 84, + "y": 284, + "w": 28, + "h": 26 + } + }, + { + "filename": "889", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 84, + "y": 310, + "w": 26, + "h": 27 + } + }, + { + "filename": "812s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2267,14 +2351,35 @@ "spriteSourceSize": { "x": 7, "y": 3, - "w": 28, - "h": 25 + "w": 26, + "h": 24 }, "frame": { - "x": 141, - "y": 256, - "w": 28, - "h": 25 + "x": 85, + "y": 337, + "w": 26, + "h": 24 + } + }, + { + "filename": "889s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 26, + "h": 27 + }, + "frame": { + "x": 84, + "y": 361, + "w": 26, + "h": 27 } }, { @@ -2292,8 +2397,8 @@ "h": 27 }, "frame": { - "x": 56, - "y": 363, + "x": 84, + "y": 388, "w": 25, "h": 27 } @@ -2313,56 +2418,14 @@ "h": 27 }, "frame": { - "x": 55, - "y": 390, + "x": 84, + "y": 415, "w": 25, "h": 27 } }, { - "filename": "862s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 55, - "y": 417, - "w": 25, - "h": 27 - } - }, - { - "filename": "892s-gigantamax-single", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 23, - "h": 29 - }, - "frame": { - "x": 54, - "y": 444, - "w": 23, - "h": 29 - } - }, - { - "filename": "6157", + "filename": "841-gigantamax", "rotated": false, "trimmed": true, "sourceSize": { @@ -2371,124 +2434,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 54, - "y": 473, - "w": 24, - "h": 27 - } - }, - { - "filename": "901", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 82, - "y": 285, - "w": 28, - "h": 23 - } - }, - { - "filename": "841", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 81, - "y": 308, - "w": 27, - "h": 24 - } - }, - { - "filename": "841s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 24 - }, - "frame": { - "x": 81, - "y": 332, - "w": 27, - "h": 24 - } - }, - { - "filename": "842", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 81, - "y": 356, - "w": 26, - "h": 25 - } - }, - { - "filename": "869-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, "y": 0, - "w": 17, + "w": 21, "h": 30 }, "frame": { - "x": 211, - "y": 48, - "w": 17, + "x": 112, + "y": 258, + "w": 21, "h": 30 } }, { - "filename": "892", + "filename": "811", "rotated": false, "trimmed": true, "sourceSize": { @@ -2496,270 +2454,18 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 23, - "h": 25 - }, - "frame": { - "x": 228, - "y": 46, - "w": 23, - "h": 25 - } - }, - { - "filename": "892s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 23, - "h": 25 - }, - "frame": { - "x": 228, - "y": 71, - "w": 23, - "h": 25 - } - }, - { - "filename": "813", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 17, - "h": 26 - }, - "frame": { - "x": 211, - "y": 78, - "w": 17, - "h": 26 - } - }, - { - "filename": "820", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, + "x": 9, "y": 3, - "w": 23, + "w": 22, "h": 24 }, "frame": { - "x": 228, - "y": 96, - "w": 23, + "x": 112, + "y": 288, + "w": 22, "h": 24 } }, - { - "filename": "876", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 24 - }, - "frame": { - "x": 209, - "y": 104, - "w": 19, - "h": 24 - } - }, - { - "filename": "820s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 24 - }, - "frame": { - "x": 228, - "y": 120, - "w": 23, - "h": 24 - } - }, - { - "filename": "876s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 24 - }, - "frame": { - "x": 209, - "y": 128, - "w": 19, - "h": 24 - } - }, - { - "filename": "866", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 24 - }, - "frame": { - "x": 228, - "y": 144, - "w": 23, - "h": 24 - } - }, - { - "filename": "852", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 209, - "y": 152, - "w": 19, - "h": 17 - } - }, - { - "filename": "866s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 23, - "h": 24 - }, - "frame": { - "x": 228, - "y": 168, - "w": 23, - "h": 24 - } - }, - { - "filename": "881", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 18, - "h": 23 - }, - "frame": { - "x": 210, - "y": 169, - "w": 18, - "h": 23 - } - }, - { - "filename": "842s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 81, - "y": 381, - "w": 26, - "h": 25 - } - }, - { - "filename": "861", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 80, - "y": 406, - "w": 25, - "h": 26 - } - }, { "filename": "839", "rotated": false, @@ -2775,96 +2481,12 @@ "h": 25 }, "frame": { - "x": 80, - "y": 432, + "x": 110, + "y": 312, "w": 25, "h": 25 } }, - { - "filename": "847", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 27, - "h": 16 - }, - "frame": { - "x": 77, - "y": 457, - "w": 27, - "h": 16 - } - }, - { - "filename": "861s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 78, - "y": 473, - "w": 25, - "h": 26 - } - }, - { - "filename": "847s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 27, - "h": 16 - }, - "frame": { - "x": 170, - "y": 192, - "w": 27, - "h": 16 - } - }, - { - "filename": "6157s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 171, - "y": 208, - "w": 24, - "h": 27 - } - }, { "filename": "817", "rotated": false, @@ -2880,14 +2502,14 @@ "h": 24 }, "frame": { - "x": 171, - "y": 235, + "x": 111, + "y": 337, "w": 24, "h": 24 } }, { - "filename": "880", + "filename": "862s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2896,271 +2518,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 4, - "w": 26, - "h": 22 - }, - "frame": { - "x": 169, - "y": 259, - "w": 26, - "h": 22 - } - }, - { - "filename": "901s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 197, - "y": 192, - "w": 28, - "h": 23 - } - }, - { - "filename": "6706", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 225, - "y": 192, - "w": 26, - "h": 25 - } - }, - { - "filename": "4145", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 195, - "y": 215, - "w": 28, - "h": 23 - } - }, - { - "filename": "4145s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 28, - "h": 23 - }, - "frame": { - "x": 223, - "y": 217, - "w": 28, - "h": 23 - } - }, - { - "filename": "6706s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 26, - "h": 25 - }, - "frame": { - "x": 195, - "y": 238, - "w": 26, - "h": 25 - } - }, - { - "filename": "4078", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 23 - }, - "frame": { - "x": 221, - "y": 240, - "w": 27, - "h": 23 - } - }, - { - "filename": "4146", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 18 - }, - "frame": { - "x": 195, - "y": 263, - "w": 28, - "h": 18 - } - }, - { - "filename": "4146s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 28, - "h": 18 - }, - "frame": { - "x": 223, - "y": 263, - "w": 28, - "h": 18 - } - }, - { - "filename": "869s-gigantamax", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 0, - "w": 17, - "h": 30 - }, - "frame": { - "x": 108, - "y": 308, - "w": 17, - "h": 30 - } - }, - { - "filename": "810", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 + "y": 1, + "w": 25, + "h": 27 }, "frame": { "x": 110, - "y": 285, - "w": 19, - "h": 23 - } - }, - { - "filename": "810s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 108, - "y": 338, - "w": 19, - "h": 23 - } - }, - { - "filename": "818", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 107, "y": 361, - "w": 22, + "w": 25, "h": 27 } }, { - "filename": "811s", + "filename": "892-gigantamax-single", "rotated": false, "trimmed": true, "sourceSize": { @@ -3168,58 +2538,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 24 + "x": 8, + "y": 0, + "w": 23, + "h": 29 }, "frame": { - "x": 107, + "x": 109, "y": 388, - "w": 22, - "h": 24 - } - }, - { - "filename": "845s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 105, - "y": 412, - "w": 24, - "h": 26 - } - }, - { - "filename": "817s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 24 - }, - "frame": { - "x": 105, - "y": 438, - "w": 24, - "h": 24 + "w": 23, + "h": 29 } }, { @@ -3237,14 +2565,14 @@ "h": 25 }, "frame": { - "x": 104, - "y": 462, + "x": 109, + "y": 417, "w": 25, "h": 25 } }, { - "filename": "880s", + "filename": "881", "rotated": false, "trimmed": true, "sourceSize": { @@ -3252,20 +2580,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 22 + "x": 11, + "y": 3, + "w": 18, + "h": 23 }, "frame": { - "x": 103, - "y": 487, - "w": 26, - "h": 22 + "x": 133, + "y": 183, + "w": 18, + "h": 23 } }, { - "filename": "844", + "filename": "810", "rotated": false, "trimmed": true, "sourceSize": { @@ -3273,79 +2601,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 19 + "x": 10, + "y": 3, + "w": 19, + "h": 23 }, "frame": { - "x": 78, - "y": 499, - "w": 25, - "h": 19 - } - }, - { - "filename": "827", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 54, - "y": 500, - "w": 24, - "h": 21 - } - }, - { - "filename": "892-gigantamax-rapid", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 53, - "y": 521, - "w": 24, - "h": 26 - } - }, - { - "filename": "892s-gigantamax-rapid", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 53, - "y": 547, - "w": 24, - "h": 26 + "x": 114, + "y": 185, + "w": 19, + "h": 23 } }, { @@ -3363,35 +2628,14 @@ "h": 27 }, "frame": { - "x": 53, - "y": 573, + "x": 114, + "y": 208, "w": 22, "h": 27 } }, { - "filename": "899", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 53, - "y": 600, - "w": 22, - "h": 27 - } - }, - { - "filename": "858", + "filename": "816", "rotated": false, "trimmed": true, "sourceSize": { @@ -3400,539 +2644,14 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, + "y": 3, "w": 22, - "h": 25 + "h": 23 }, "frame": { - "x": 53, - "y": 627, + "x": 115, + "y": 235, "w": 22, - "h": 25 - } - }, - { - "filename": "899s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 22, - "h": 27 - }, - "frame": { - "x": 56, - "y": 652, - "w": 22, - "h": 27 - } - }, - { - "filename": "6724", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 56, - "y": 679, - "w": 17, - "h": 28 - } - }, - { - "filename": "6724s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 1, - "w": 17, - "h": 28 - }, - "frame": { - "x": 60, - "y": 707, - "w": 17, - "h": 28 - } - }, - { - "filename": "813s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 17, - "h": 26 - }, - "frame": { - "x": 61, - "y": 735, - "w": 17, - "h": 26 - } - }, - { - "filename": "903", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 21, - "h": 27 - }, - "frame": { - "x": 59, - "y": 761, - "w": 21, - "h": 27 - } - }, - { - "filename": "886", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 103, - "y": 509, - "w": 26, - "h": 24 - } - }, - { - "filename": "844s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 19 - }, - "frame": { - "x": 78, - "y": 518, - "w": 25, - "h": 19 - } - }, - { - "filename": "886s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 77, - "y": 537, - "w": 26, - "h": 24 - } - }, - { - "filename": "897", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 103, - "y": 533, - "w": 26, - "h": 24 - } - }, - { - "filename": "892-rapid-strike", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 22 - }, - "frame": { - "x": 77, - "y": 561, - "w": 26, - "h": 22 - } - }, - { - "filename": "897s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 24 - }, - "frame": { - "x": 103, - "y": 557, - "w": 26, - "h": 24 - } - }, - { - "filename": "900", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 75, - "y": 583, - "w": 25, - "h": 25 - } - }, - { - "filename": "900s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 75, - "y": 608, - "w": 25, - "h": 25 - } - }, - { - "filename": "6628", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 10, - "w": 25, - "h": 19 - }, - "frame": { - "x": 75, - "y": 633, - "w": 25, - "h": 19 - } - }, - { - "filename": "903s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 21, - "h": 27 - }, - "frame": { - "x": 78, - "y": 652, - "w": 21, - "h": 27 - } - }, - { - "filename": "4078s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 27, - "h": 23 - }, - "frame": { - "x": 73, - "y": 679, - "w": 27, - "h": 23 - } - }, - { - "filename": "858s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 25 - }, - "frame": { - "x": 77, - "y": 702, - "w": 22, - "h": 25 - } - }, - { - "filename": "4199", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 27 - }, - "frame": { - "x": 78, - "y": 727, - "w": 20, - "h": 27 - } - }, - { - "filename": "4199s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 27 - }, - "frame": { - "x": 80, - "y": 754, - "w": 20, - "h": 27 - } - }, - { - "filename": "846", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 15 - }, - "frame": { - "x": 80, - "y": 781, - "w": 25, - "h": 15 - } - }, - { - "filename": "6713", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 23 - }, - "frame": { - "x": 129, - "y": 281, - "w": 27, - "h": 23 - } - }, - { - "filename": "6713s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 23 - }, - "frame": { - "x": 156, - "y": 281, - "w": 27, - "h": 23 - } - }, - { - "filename": "879", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 23 - }, - "frame": { - "x": 183, - "y": 281, - "w": 25, - "h": 23 - } - }, - { - "filename": "879s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 23 - }, - "frame": { - "x": 208, - "y": 281, - "w": 25, - "h": 23 - } - }, - { - "filename": "881s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 18, - "h": 23 - }, - "frame": { - "x": 233, - "y": 281, - "w": 18, "h": 23 } }, @@ -3951,14 +2670,14 @@ "h": 29 }, "frame": { - "x": 125, - "y": 308, + "x": 136, + "y": 206, "w": 15, "h": 29 } }, { - "filename": "892s-rapid-strike", + "filename": "828s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3966,20 +2685,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 26, - "h": 22 + "x": 6, + "y": 3, + "w": 27, + "h": 24 }, "frame": { - "x": 140, - "y": 304, - "w": 26, - "h": 22 + "x": 151, + "y": 205, + "w": 27, + "h": 24 } }, { - "filename": "873", + "filename": "894s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3987,62 +2706,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 + "x": 5, + "y": 3, + "w": 30, + "h": 23 }, "frame": { - "x": 166, - "y": 304, - "w": 25, - "h": 22 + "x": 178, + "y": 220, + "w": 30, + "h": 23 } }, { - "filename": "873s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 191, - "y": 304, - "w": 25, - "h": 22 - } - }, - { - "filename": "878", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 216, - "y": 304, - "w": 25, - "h": 22 - } - }, - { - "filename": "838", + "filename": "811s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4056,14 +2733,14 @@ "h": 24 }, "frame": { - "x": 127, - "y": 337, + "x": 208, + "y": 222, "w": 22, "h": 24 } }, { - "filename": "884", + "filename": "817s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4071,60 +2748,270 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 25 - }, - "frame": { - "x": 129, - "y": 361, - "w": 22, - "h": 25 - } - }, - { - "filename": "884s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 25 - }, - "frame": { - "x": 129, - "y": 386, - "w": 22, - "h": 25 - } - }, - { - "filename": "838s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 8, "y": 3, - "w": 22, + "w": 24, "h": 24 }, "frame": { - "x": 129, - "y": 411, - "w": 22, + "x": 230, + "y": 239, + "w": 24, "h": 24 } }, + { + "filename": "841", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 151, + "y": 229, + "w": 27, + "h": 24 + } + }, + { + "filename": "875-no-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 3, + "w": 14, + "h": 23 + }, + "frame": { + "x": 137, + "y": 235, + "w": 14, + "h": 23 + } + }, + { + "filename": "841s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 133, + "y": 258, + "w": 21, + "h": 30 + } + }, + { + "filename": "892s-gigantamax-single", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 29 + }, + "frame": { + "x": 154, + "y": 253, + "w": 23, + "h": 29 + } + }, + { + "filename": "820", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 24 + }, + "frame": { + "x": 134, + "y": 288, + "w": 23, + "h": 24 + } + }, + { + "filename": "842-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 135, + "y": 312, + "w": 21, + "h": 30 + } + }, + { + "filename": "842s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 135, + "y": 342, + "w": 21, + "h": 30 + } + }, + { + "filename": "869s-gigantamax", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 0, + "w": 17, + "h": 30 + }, + "frame": { + "x": 157, + "y": 282, + "w": 17, + "h": 30 + } + }, + { + "filename": "899", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 156, + "y": 312, + "w": 22, + "h": 27 + } + }, + { + "filename": "899s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 22, + "h": 27 + }, + "frame": { + "x": 156, + "y": 339, + "w": 22, + "h": 27 + } + }, + { + "filename": "888s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 28, + "h": 23 + }, + "frame": { + "x": 178, + "y": 243, + "w": 28, + "h": 23 + } + }, + { + "filename": "827", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 21 + }, + "frame": { + "x": 206, + "y": 246, + "w": 24, + "h": 21 + } + }, { "filename": "896", "rotated": false, @@ -4140,12 +3027,54 @@ "h": 24 }, "frame": { - "x": 129, - "y": 435, + "x": 230, + "y": 263, "w": 24, "h": 24 } }, + { + "filename": "901", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 177, + "y": 266, + "w": 28, + "h": 23 + } + }, + { + "filename": "861", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 205, + "y": 267, + "w": 25, + "h": 26 + } + }, { "filename": "896s", "rotated": false, @@ -4161,12 +3090,54 @@ "h": 24 }, "frame": { - "x": 129, - "y": 459, + "x": 230, + "y": 287, "w": 24, "h": 24 } }, + { + "filename": "901s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 174, + "y": 289, + "w": 28, + "h": 23 + } + }, + { + "filename": "904", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 28, + "h": 25 + }, + "frame": { + "x": 202, + "y": 293, + "w": 28, + "h": 25 + } + }, { "filename": "4080", "rotated": false, @@ -4182,8 +3153,8 @@ "h": 23 }, "frame": { - "x": 129, - "y": 483, + "x": 230, + "y": 311, "w": 24, "h": 23 } @@ -4203,14 +3174,14 @@ "h": 23 }, "frame": { - "x": 129, - "y": 506, + "x": 178, + "y": 312, "w": 24, "h": 23 } }, { - "filename": "6571", + "filename": "904s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4219,57 +3190,15 @@ }, "spriteSourceSize": { "x": 7, - "y": 5, - "w": 25, - "h": 23 + "y": 3, + "w": 28, + "h": 25 }, "frame": { - "x": 129, - "y": 529, - "w": 25, - "h": 23 - } - }, - { - "filename": "6571s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 25, - "h": 23 - }, - "frame": { - "x": 129, - "y": 552, - "w": 25, - "h": 23 - } - }, - { - "filename": "878s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 22 - }, - "frame": { - "x": 149, - "y": 326, - "w": 25, - "h": 22 + "x": 202, + "y": 318, + "w": 28, + "h": 25 } }, { @@ -4287,8 +3216,8 @@ "h": 21 }, "frame": { - "x": 174, - "y": 326, + "x": 230, + "y": 334, "w": 24, "h": 21 } @@ -4308,14 +3237,14 @@ "h": 21 }, "frame": { - "x": 198, - "y": 326, + "x": 178, + "y": 335, "w": 24, "h": 21 } }, { - "filename": "814", + "filename": "4145", "rotated": false, "trimmed": true, "sourceSize": { @@ -4323,20 +3252,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 6, "y": 3, - "w": 21, + "w": 28, "h": 23 }, "frame": { - "x": 222, - "y": 326, - "w": 21, + "x": 202, + "y": 343, + "w": 28, "h": 23 } }, { - "filename": "853", + "filename": "4077s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4345,19 +3274,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 3, - "w": 23, - "h": 23 + "y": 4, + "w": 24, + "h": 21 }, "frame": { - "x": 151, - "y": 348, - "w": 23, - "h": 23 + "x": 230, + "y": 355, + "w": 24, + "h": 21 } }, { - "filename": "853s", + "filename": "885", "rotated": false, "trimmed": true, "sourceSize": { @@ -4366,19 +3295,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 3, - "w": 23, - "h": 23 + "y": 6, + "w": 24, + "h": 17 }, "frame": { - "x": 174, - "y": 347, - "w": 23, - "h": 23 + "x": 178, + "y": 356, + "w": 24, + "h": 17 } }, { - "filename": "6628s", + "filename": "4145s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4386,20 +3315,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 10, - "w": 25, - "h": 19 + "x": 6, + "y": 3, + "w": 28, + "h": 23 }, "frame": { - "x": 197, - "y": 347, - "w": 25, - "h": 19 + "x": 202, + "y": 366, + "w": 28, + "h": 23 } }, { - "filename": "816", + "filename": "6211", "rotated": false, "trimmed": true, "sourceSize": { @@ -4407,16 +3336,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 + "x": 8, + "y": 9, + "w": 24, + "h": 19 }, "frame": { - "x": 151, - "y": 371, - "w": 22, - "h": 23 + "x": 230, + "y": 376, + "w": 24, + "h": 19 } }, { @@ -4434,14 +3363,203 @@ "h": 23 }, "frame": { - "x": 151, - "y": 394, + "x": 135, + "y": 372, "w": 22, "h": 23 } }, { - "filename": "4618", + "filename": "903", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 21, + "h": 27 + }, + "frame": { + "x": 157, + "y": 366, + "w": 21, + "h": 27 + } + }, + { + "filename": "6211s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 24, + "h": 19 + }, + "frame": { + "x": 178, + "y": 373, + "w": 24, + "h": 19 + } + }, + { + "filename": "873", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 132, + "y": 395, + "w": 25, + "h": 22 + } + }, + { + "filename": "842", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 134, + "y": 417, + "w": 26, + "h": 25 + } + }, + { + "filename": "820s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 24 + }, + "frame": { + "x": 157, + "y": 393, + "w": 23, + "h": 24 + } + }, + { + "filename": "842s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 180, + "y": 392, + "w": 26, + "h": 25 + } + }, + { + "filename": "841s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 24 + }, + "frame": { + "x": 160, + "y": 417, + "w": 27, + "h": 24 + } + }, + { + "filename": "892", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 23, + "h": 25 + }, + "frame": { + "x": 206, + "y": 389, + "w": 23, + "h": 25 + } + }, + { + "filename": "861s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 229, + "y": 395, + "w": 25, + "h": 26 + } + }, + { + "filename": "838", "rotated": false, "trimmed": true, "sourceSize": { @@ -4450,15 +3568,57 @@ }, "spriteSourceSize": { "x": 9, - "y": 6, + "y": 3, "w": 22, - "h": 18 + "h": 24 }, "frame": { - "x": 151, + "x": 187, "y": 417, "w": 22, - "h": 18 + "h": 24 + } + }, + { + "filename": "4199", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 20, + "h": 27 + }, + "frame": { + "x": 209, + "y": 414, + "w": 20, + "h": 27 + } + }, + { + "filename": "900", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 229, + "y": 421, + "w": 25, + "h": 25 } }, { @@ -4476,12 +3636,33 @@ "h": 29 }, "frame": { - "x": 153, - "y": 435, + "x": 31, + "y": 706, "w": 15, "h": 29 } }, + { + "filename": "849", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 16, + "h": 25 + }, + "frame": { + "x": 31, + "y": 735, + "w": 16, + "h": 25 + } + }, { "filename": "875", "rotated": false, @@ -4497,12 +3678,411 @@ "h": 27 }, "frame": { - "x": 153, - "y": 464, + "x": 30, + "y": 760, "w": 17, "h": 27 } }, + { + "filename": "850", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 21, + "h": 10 + }, + "frame": { + "x": 0, + "y": 787, + "w": 21, + "h": 10 + } + }, + { + "filename": "850s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 21, + "h": 10 + }, + "frame": { + "x": 21, + "y": 787, + "w": 21, + "h": 10 + } + }, + { + "filename": "4146", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 18 + }, + "frame": { + "x": 56, + "y": 442, + "w": 28, + "h": 18 + } + }, + { + "filename": "4146s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 28, + "h": 18 + }, + "frame": { + "x": 84, + "y": 442, + "w": 28, + "h": 18 + } + }, + { + "filename": "4078", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 23 + }, + "frame": { + "x": 112, + "y": 442, + "w": 27, + "h": 23 + } + }, + { + "filename": "838s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 24 + }, + "frame": { + "x": 139, + "y": 442, + "w": 22, + "h": 24 + } + }, + { + "filename": "6706", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 161, + "y": 441, + "w": 26, + "h": 25 + } + }, + { + "filename": "6706s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 26, + "h": 25 + }, + "frame": { + "x": 187, + "y": 441, + "w": 26, + "h": 25 + } + }, + { + "filename": "849s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 16, + "h": 25 + }, + "frame": { + "x": 213, + "y": 441, + "w": 16, + "h": 25 + } + }, + { + "filename": "900s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 229, + "y": 446, + "w": 25, + "h": 25 + } + }, + { + "filename": "880", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 26, + "h": 22 + }, + "frame": { + "x": 30, + "y": 443, + "w": 26, + "h": 22 + } + }, + { + "filename": "886", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 29, + "y": 465, + "w": 26, + "h": 24 + } + }, + { + "filename": "886s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 29, + "y": 489, + "w": 26, + "h": 24 + } + }, + { + "filename": "897", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 29, + "y": 513, + "w": 26, + "h": 24 + } + }, + { + "filename": "903s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 21, + "h": 27 + }, + "frame": { + "x": 29, + "y": 537, + "w": 21, + "h": 27 + } + }, + { + "filename": "4199s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 20, + "h": 27 + }, + "frame": { + "x": 32, + "y": 564, + "w": 20, + "h": 27 + } + }, + { + "filename": "858", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 25 + }, + "frame": { + "x": 32, + "y": 591, + "w": 22, + "h": 25 + } + }, + { + "filename": "858s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 25 + }, + "frame": { + "x": 32, + "y": 616, + "w": 22, + "h": 25 + } + }, + { + "filename": "884", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 25 + }, + "frame": { + "x": 32, + "y": 641, + "w": 22, + "h": 25 + } + }, { "filename": "875s", "rotated": false, @@ -4518,14 +4098,14 @@ "h": 27 }, "frame": { - "x": 153, - "y": 491, + "x": 50, + "y": 537, "w": 17, "h": 27 } }, { - "filename": "814s", + "filename": "884s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4534,40 +4114,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 3, - "w": 21, - "h": 23 + "y": 2, + "w": 22, + "h": 25 }, "frame": { - "x": 222, - "y": 349, - "w": 21, - "h": 23 + "x": 52, + "y": 564, + "w": 22, + "h": 25 } }, { - "filename": "846s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 15 - }, - "frame": { - "x": 197, - "y": 366, - "w": 25, - "h": 15 - } - }, - { - "filename": "883", + "filename": "892s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4576,19 +4135,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 4, + "y": 2, "w": 23, - "h": 21 + "h": 25 }, "frame": { - "x": 174, - "y": 370, + "x": 54, + "y": 589, "w": 23, - "h": 21 + "h": 25 } }, { - "filename": "855", + "filename": "866", "rotated": false, "trimmed": true, "sourceSize": { @@ -4596,15 +4155,162 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 8, "y": 3, - "w": 22, + "w": 23, + "h": 24 + }, + "frame": { + "x": 54, + "y": 614, + "w": 23, + "h": 24 + } + }, + { + "filename": "866s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 24 + }, + "frame": { + "x": 54, + "y": 638, + "w": 23, + "h": 24 + } + }, + { + "filename": "897s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 24 + }, + "frame": { + "x": 33, + "y": 666, + "w": 26, + "h": 24 + } + }, + { + "filename": "847", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 27, + "h": 16 + }, + "frame": { + "x": 33, + "y": 690, + "w": 27, + "h": 16 + } + }, + { + "filename": "6724", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 46, + "y": 706, + "w": 17, + "h": 28 + } + }, + { + "filename": "6724s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 1, + "w": 17, + "h": 28 + }, + "frame": { + "x": 47, + "y": 734, + "w": 17, + "h": 28 + } + }, + { + "filename": "863s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 20, + "h": 24 + }, + "frame": { + "x": 47, + "y": 762, + "w": 20, + "h": 24 + } + }, + { + "filename": "810s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, "h": 23 }, "frame": { - "x": 173, - "y": 391, - "w": 22, + "x": 59, + "y": 662, + "w": 19, "h": 23 } }, @@ -4623,35 +4329,14 @@ "h": 21 }, "frame": { - "x": 173, - "y": 414, + "x": 60, + "y": 685, "w": 22, "h": 21 } }, { - "filename": "855s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 - }, - "frame": { - "x": 168, - "y": 435, - "w": 22, - "h": 23 - } - }, - { - "filename": "863", + "filename": "830", "rotated": false, "trimmed": true, "sourceSize": { @@ -4661,18 +4346,18 @@ "spriteSourceSize": { "x": 10, "y": 3, - "w": 20, - "h": 24 + "w": 19, + "h": 23 }, "frame": { - "x": 170, - "y": 458, - "w": 20, - "h": 24 + "x": 63, + "y": 706, + "w": 19, + "h": 23 } }, { - "filename": "863s", + "filename": "830s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4682,18 +4367,60 @@ "spriteSourceSize": { "x": 10, "y": 3, - "w": 20, - "h": 24 + "w": 19, + "h": 23 }, "frame": { - "x": 170, - "y": 482, - "w": 20, - "h": 24 + "x": 64, + "y": 729, + "w": 19, + "h": 23 } }, { - "filename": "4079", + "filename": "847s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 27, + "h": 16 + }, + "frame": { + "x": 56, + "y": 460, + "w": 27, + "h": 16 + } + }, + { + "filename": "4078s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 27, + "h": 23 + }, + "frame": { + "x": 55, + "y": 476, + "w": 27, + "h": 23 + } + }, + { + "filename": "6713", "rotated": false, "trimmed": true, "sourceSize": { @@ -4702,19 +4429,19 @@ }, "spriteSourceSize": { "x": 7, - "y": 8, - "w": 26, - "h": 14 + "y": 5, + "w": 27, + "h": 23 }, "frame": { - "x": 197, - "y": 381, - "w": 26, - "h": 14 + "x": 55, + "y": 499, + "w": 27, + "h": 23 } }, { - "filename": "860", + "filename": "846", "rotated": false, "trimmed": true, "sourceSize": { @@ -4722,20 +4449,62 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 7, + "y": 7, + "w": 25, + "h": 15 + }, + "frame": { + "x": 55, + "y": 522, + "w": 25, + "h": 15 + } + }, + { + "filename": "6713s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 83, + "y": 460, + "w": 27, + "h": 23 + } + }, + { + "filename": "879", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, "y": 3, - "w": 22, + "w": 25, "h": 23 }, "frame": { - "x": 195, - "y": 395, - "w": 22, + "x": 82, + "y": 483, + "w": 25, "h": 23 } }, { - "filename": "819s", + "filename": "880s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4743,20 +4512,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 7, "y": 4, - "w": 22, - "h": 21 + "w": 26, + "h": 22 }, "frame": { - "x": 195, - "y": 418, - "w": 22, - "h": 21 + "x": 110, + "y": 465, + "w": 26, + "h": 22 } }, { - "filename": "860s", + "filename": "892-rapid-strike", "rotated": false, "trimmed": true, "sourceSize": { @@ -4764,20 +4533,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 + "x": 7, + "y": 4, + "w": 26, + "h": 22 }, "frame": { - "x": 190, - "y": 439, - "w": 22, - "h": 23 + "x": 136, + "y": 466, + "w": 26, + "h": 22 } }, { - "filename": "876-female", + "filename": "892s-rapid-strike", "rotated": false, "trimmed": true, "sourceSize": { @@ -4785,15 +4554,183 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 7, + "y": 4, + "w": 26, + "h": 22 + }, + "frame": { + "x": 162, + "y": 466, + "w": 26, + "h": 22 + } + }, + { + "filename": "873s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 188, + "y": 466, + "w": 25, + "h": 22 + } + }, + { + "filename": "833", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, "y": 3, - "w": 22, + "w": 16, "h": 23 }, "frame": { - "x": 190, - "y": 462, - "w": 22, + "x": 213, + "y": 466, + "w": 16, + "h": 23 + } + }, + { + "filename": "879s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 23 + }, + "frame": { + "x": 229, + "y": 471, + "w": 25, + "h": 23 + } + }, + { + "filename": "844", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 19 + }, + "frame": { + "x": 82, + "y": 506, + "w": 25, + "h": 19 + } + }, + { + "filename": "6571", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 107, + "y": 487, + "w": 25, + "h": 23 + } + }, + { + "filename": "878", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 132, + "y": 488, + "w": 25, + "h": 22 + } + }, + { + "filename": "878s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 22 + }, + "frame": { + "x": 157, + "y": 488, + "w": 25, + "h": 22 + } + }, + { + "filename": "6571s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 25, + "h": 23 + }, + "frame": { + "x": 182, + "y": 488, + "w": 25, "h": 23 } }, @@ -4812,14 +4749,14 @@ "h": 22 }, "frame": { - "x": 190, - "y": 485, + "x": 207, + "y": 489, "w": 22, "h": 22 } }, { - "filename": "876s-female", + "filename": "844s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4827,440 +4764,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 - }, - "frame": { - "x": 223, - "y": 372, - "w": 22, - "h": 23 - } - }, - { - "filename": "882", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 - }, - "frame": { - "x": 217, - "y": 395, - "w": 22, - "h": 23 - } - }, - { - "filename": "832s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 - }, - "frame": { - "x": 217, - "y": 418, - "w": 22, - "h": 22 - } - }, - { - "filename": "882s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 23 - }, - "frame": { - "x": 212, - "y": 440, - "w": 22, - "h": 23 - } - }, - { - "filename": "877-hangry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 234, - "y": 440, - "w": 17, - "h": 21 - } - }, - { - "filename": "836", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 - }, - "frame": { - "x": 212, - "y": 463, - "w": 22, - "h": 22 - } - }, - { - "filename": "877", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 234, - "y": 461, - "w": 17, - "h": 21 - } - }, - { - "filename": "836s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 - }, - "frame": { - "x": 212, - "y": 485, - "w": 22, - "h": 22 - } - }, - { - "filename": "877s-hangry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 234, - "y": 482, - "w": 17, - "h": 21 - } - }, - { - "filename": "877s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 21 - }, - "frame": { - "x": 234, - "y": 503, - "w": 17, - "h": 21 - } - }, - { - "filename": "825", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 18 - }, - "frame": { - "x": 170, - "y": 506, - "w": 20, - "h": 18 - } - }, - { - "filename": "885", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 24, - "h": 17 - }, - "frame": { - "x": 190, - "y": 507, - "w": 24, - "h": 17 - } - }, - { - "filename": "825s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 18 - }, - "frame": { - "x": 214, - "y": 507, - "w": 20, - "h": 18 - } - }, - { - "filename": "6215", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 234, - "y": 524, - "w": 17, - "h": 21 - } - }, - { - "filename": "849", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 16, - "h": 25 - }, - "frame": { - "x": 154, - "y": 518, - "w": 16, - "h": 25 - } - }, - { - "filename": "4077s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 21 - }, - "frame": { - "x": 170, - "y": 524, - "w": 24, - "h": 21 - } - }, - { - "filename": "849s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 16, - "h": 25 - }, - "frame": { - "x": 154, - "y": 543, - "w": 16, - "h": 25 - } - }, - { - "filename": "857", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 - }, - "frame": { - "x": 170, - "y": 545, - "w": 22, - "h": 22 - } - }, - { - "filename": "830", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 194, - "y": 524, - "w": 19, - "h": 23 - } - }, - { - "filename": "4052", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 21, - "h": 21 - }, - "frame": { - "x": 213, - "y": 525, - "w": 21, - "h": 21 - } - }, - { - "filename": "835", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 7, "y": 5, - "w": 22, - "h": 20 + "w": 25, + "h": 19 }, "frame": { - "x": 192, - "y": 547, - "w": 22, - "h": 20 + "x": 229, + "y": 494, + "w": 25, + "h": 19 } }, { - "filename": "857s", + "filename": "846s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5268,20 +4785,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 22, - "h": 22 + "x": 7, + "y": 7, + "w": 25, + "h": 15 }, "frame": { - "x": 214, - "y": 546, - "w": 22, - "h": 22 + "x": 107, + "y": 510, + "w": 25, + "h": 15 } }, { - "filename": "849-lowkey", + "filename": "4079", "rotated": false, "trimmed": true, "sourceSize": { @@ -5289,35 +4806,14 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 15, - "h": 23 - }, - "frame": { - "x": 236, - "y": 545, - "w": 15, - "h": 23 - } - }, - { - "filename": "4079s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 14, + "x": 7, + "y": 8, "w": 26, "h": 14 }, "frame": { - "x": 129, - "y": 575, + "x": 132, + "y": 510, "w": 26, "h": 14 } @@ -5337,14 +4833,14 @@ "h": 17 }, "frame": { - "x": 105, - "y": 581, + "x": 158, + "y": 510, "w": 24, "h": 17 } }, { - "filename": "883s", + "filename": "6628", "rotated": false, "trimmed": true, "sourceSize": { @@ -5352,83 +4848,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 21 - }, - "frame": { - "x": 100, - "y": 598, - "w": 23, - "h": 21 - } - }, - { - "filename": "830s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 23 - }, - "frame": { - "x": 100, - "y": 619, - "w": 19, - "h": 23 - } - }, - { - "filename": "6211", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 24, + "x": 7, + "y": 10, + "w": 25, "h": 19 }, "frame": { - "x": 129, - "y": 589, - "w": 24, + "x": 182, + "y": 511, + "w": 25, "h": 19 } }, { - "filename": "821", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 100, - "y": 642, - "w": 19, - "h": 16 - } - }, - { - "filename": "4052s", + "filename": "819s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5438,16 +4871,247 @@ "spriteSourceSize": { "x": 9, "y": 4, - "w": 21, + "w": 22, "h": 21 }, "frame": { - "x": 99, - "y": 658, - "w": 21, + "x": 207, + "y": 511, + "w": 22, "h": 21 } }, + { + "filename": "6628s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 10, + "w": 25, + "h": 19 + }, + "frame": { + "x": 229, + "y": 513, + "w": 25, + "h": 19 + } + }, + { + "filename": "833s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 16, + "h": 23 + }, + "frame": { + "x": 67, + "y": 537, + "w": 16, + "h": 23 + } + }, + { + "filename": "853", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 23 + }, + "frame": { + "x": 83, + "y": 525, + "w": 23, + "h": 23 + } + }, + { + "filename": "853s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 23, + "h": 23 + }, + "frame": { + "x": 106, + "y": 525, + "w": 23, + "h": 23 + } + }, + { + "filename": "4079s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 14, + "w": 26, + "h": 14 + }, + "frame": { + "x": 83, + "y": 548, + "w": 26, + "h": 14 + } + }, + { + "filename": "822", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 19 + }, + "frame": { + "x": 109, + "y": 548, + "w": 22, + "h": 19 + } + }, + { + "filename": "855", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 74, + "y": 562, + "w": 22, + "h": 23 + } + }, + { + "filename": "855s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 77, + "y": 585, + "w": 22, + "h": 23 + } + }, + { + "filename": "860", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 77, + "y": 608, + "w": 22, + "h": 23 + } + }, + { + "filename": "860s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 77, + "y": 631, + "w": 22, + "h": 23 + } + }, + { + "filename": "876-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 78, + "y": 654, + "w": 22, + "h": 23 + } + }, { "filename": "856", "rotated": false, @@ -5463,8 +5127,8 @@ "h": 23 }, "frame": { - "x": 100, - "y": 679, + "x": 82, + "y": 677, "w": 19, "h": 23 } @@ -5484,285 +5148,12 @@ "h": 23 }, "frame": { - "x": 99, - "y": 702, + "x": 82, + "y": 700, "w": 19, "h": 23 } }, - { - "filename": "824", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 15, - "h": 21 - }, - "frame": { - "x": 155, - "y": 568, - "w": 15, - "h": 21 - } - }, - { - "filename": "6211s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 24, - "h": 19 - }, - "frame": { - "x": 170, - "y": 567, - "w": 24, - "h": 19 - } - }, - { - "filename": "831", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 19 - }, - "frame": { - "x": 194, - "y": 567, - "w": 20, - "h": 19 - } - }, - { - "filename": "822", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 19 - }, - "frame": { - "x": 214, - "y": 568, - "w": 22, - "h": 19 - } - }, - { - "filename": "849s-lowkey", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 15, - "h": 23 - }, - "frame": { - "x": 236, - "y": 568, - "w": 15, - "h": 23 - } - }, - { - "filename": "822s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 19 - }, - "frame": { - "x": 153, - "y": 589, - "w": 22, - "h": 19 - } - }, - { - "filename": "835s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 20 - }, - "frame": { - "x": 175, - "y": 586, - "w": 22, - "h": 20 - } - }, - { - "filename": "859", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 20 - }, - "frame": { - "x": 197, - "y": 586, - "w": 17, - "h": 20 - } - }, - { - "filename": "4144", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 19 - }, - "frame": { - "x": 214, - "y": 587, - "w": 22, - "h": 19 - } - }, - { - "filename": "6705", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 6, - "w": 15, - "h": 22 - }, - "frame": { - "x": 236, - "y": 591, - "w": 15, - "h": 22 - } - }, - { - "filename": "833", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 16, - "h": 23 - }, - "frame": { - "x": 119, - "y": 619, - "w": 16, - "h": 23 - } - }, - { - "filename": "821s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 19, - "h": 16 - }, - "frame": { - "x": 119, - "y": 642, - "w": 19, - "h": 16 - } - }, - { - "filename": "848", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 21 - }, - "frame": { - "x": 120, - "y": 658, - "w": 18, - "h": 21 - } - }, { "filename": "869-caramel-swirl", "rotated": false, @@ -5778,12 +5169,33 @@ "h": 23 }, "frame": { - "x": 119, - "y": 679, + "x": 83, + "y": 723, "w": 19, "h": 23 } }, + { + "filename": "4618", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 18 + }, + "frame": { + "x": 96, + "y": 567, + "w": 22, + "h": 18 + } + }, { "filename": "869-lemon-cream", "rotated": false, @@ -5799,8 +5211,8 @@ "h": 23 }, "frame": { - "x": 118, - "y": 702, + "x": 99, + "y": 585, "w": 19, "h": 23 } @@ -5820,7 +5232,7 @@ "h": 23 }, "frame": { - "x": 135, + "x": 99, "y": 608, "w": 19, "h": 23 @@ -5841,33 +5253,12 @@ "h": 23 }, "frame": { - "x": 154, - "y": 608, + "x": 99, + "y": 631, "w": 19, "h": 23 } }, - { - "filename": "850", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 10 - }, - "frame": { - "x": 135, - "y": 631, - "w": 21, - "h": 10 - } - }, { "filename": "869-rainbow-swirl", "rotated": false, @@ -5883,8 +5274,8 @@ "h": 23 }, "frame": { - "x": 138, - "y": 641, + "x": 100, + "y": 654, "w": 19, "h": 23 } @@ -5904,75 +5295,12 @@ "h": 23 }, "frame": { - "x": 138, - "y": 664, + "x": 101, + "y": 677, "w": 19, "h": 23 } }, - { - "filename": "831s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 19 - }, - "frame": { - "x": 138, - "y": 687, - "w": 20, - "h": 19 - } - }, - { - "filename": "4144s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 19 - }, - "frame": { - "x": 137, - "y": 706, - "w": 22, - "h": 19 - } - }, - { - "filename": "833s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 16, - "h": 23 - }, - "frame": { - "x": 157, - "y": 631, - "w": 16, - "h": 23 - } - }, { "filename": "869-ruby-swirl", "rotated": false, @@ -5988,8 +5316,8 @@ "h": 23 }, "frame": { - "x": 157, - "y": 654, + "x": 101, + "y": 700, "w": 19, "h": 23 } @@ -6009,12 +5337,54 @@ "h": 23 }, "frame": { - "x": 158, - "y": 677, + "x": 102, + "y": 723, "w": 19, "h": 23 } }, + { + "filename": "849-lowkey", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 15, + "h": 23 + }, + "frame": { + "x": 118, + "y": 567, + "w": 15, + "h": 23 + } + }, + { + "filename": "849s-lowkey", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 3, + "w": 15, + "h": 23 + }, + "frame": { + "x": 118, + "y": 590, + "w": 15, + "h": 23 + } + }, { "filename": "869", "rotated": false, @@ -6030,12 +5400,390 @@ "h": 23 }, "frame": { - "x": 159, + "x": 118, + "y": 613, + "w": 19, + "h": 23 + } + }, + { + "filename": "825", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 18 + }, + "frame": { + "x": 118, + "y": 636, + "w": 20, + "h": 18 + } + }, + { + "filename": "869s-caramel-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 119, + "y": 654, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-lemon-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 120, + "y": 677, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-matcha-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 120, "y": 700, "w": 19, "h": 23 } }, + { + "filename": "869s-mint-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 121, + "y": 723, + "w": 19, + "h": 23 + } + }, + { + "filename": "869s-rainbow-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 67, + "y": 752, + "w": 19, + "h": 23 + } + }, + { + "filename": "876s-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 67, + "y": 775, + "w": 22, + "h": 23 + } + }, + { + "filename": "882", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 86, + "y": 746, + "w": 22, + "h": 23 + } + }, + { + "filename": "882s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 22, + "h": 23 + }, + "frame": { + "x": 108, + "y": 746, + "w": 22, + "h": 23 + } + }, + { + "filename": "832s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 89, + "y": 769, + "w": 22, + "h": 22 + } + }, + { + "filename": "836", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 111, + "y": 769, + "w": 22, + "h": 22 + } + }, + { + "filename": "869s-ruby-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 130, + "y": 746, + "w": 19, + "h": 23 + } + }, + { + "filename": "836s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 133, + "y": 769, + "w": 22, + "h": 22 + } + }, + { + "filename": "869s-ruby-swirl", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 129, + "y": 525, + "w": 19, + "h": 23 + } + }, + { + "filename": "822s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 19 + }, + "frame": { + "x": 131, + "y": 548, + "w": 22, + "h": 19 + } + }, + { + "filename": "857", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 133, + "y": 567, + "w": 22, + "h": 22 + } + }, + { + "filename": "857s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 22, + "h": 22 + }, + "frame": { + "x": 133, + "y": 589, + "w": 22, + "h": 22 + } + }, + { + "filename": "869s-salted-cream", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 3, + "w": 19, + "h": 23 + }, + "frame": { + "x": 137, + "y": 611, + "w": 19, + "h": 23 + } + }, { "filename": "869s", "rotated": false, @@ -6051,12 +5799,180 @@ "h": 23 }, "frame": { - "x": 173, - "y": 608, + "x": 138, + "y": 634, "w": 19, "h": 23 } }, + { + "filename": "835", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 20 + }, + "frame": { + "x": 138, + "y": 657, + "w": 22, + "h": 20 + } + }, + { + "filename": "883", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 21 + }, + "frame": { + "x": 139, + "y": 677, + "w": 23, + "h": 21 + } + }, + { + "filename": "883s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 21 + }, + "frame": { + "x": 139, + "y": 698, + "w": 23, + "h": 21 + } + }, + { + "filename": "835s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 20 + }, + "frame": { + "x": 140, + "y": 719, + "w": 22, + "h": 20 + } + }, + { + "filename": "4052", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 148, + "y": 527, + "w": 21, + "h": 21 + } + }, + { + "filename": "831", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 19 + }, + "frame": { + "x": 153, + "y": 548, + "w": 20, + "h": 19 + } + }, + { + "filename": "881s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 18, + "h": 23 + }, + "frame": { + "x": 155, + "y": 567, + "w": 18, + "h": 23 + } + }, + { + "filename": "848", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 21 + }, + "frame": { + "x": 155, + "y": 590, + "w": 18, + "h": 21 + } + }, { "filename": "6549", "rotated": false, @@ -6072,12 +5988,264 @@ "h": 23 }, "frame": { - "x": 173, - "y": 631, + "x": 156, + "y": 611, "w": 16, "h": 23 } }, + { + "filename": "6549s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 16, + "h": 23 + }, + "frame": { + "x": 157, + "y": 634, + "w": 16, + "h": 23 + } + }, + { + "filename": "859s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 20 + }, + "frame": { + "x": 160, + "y": 657, + "w": 17, + "h": 20 + } + }, + { + "filename": "875s-no-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 3, + "w": 14, + "h": 23 + }, + "frame": { + "x": 162, + "y": 677, + "w": 14, + "h": 23 + } + }, + { + "filename": "891", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 22 + }, + "frame": { + "x": 162, + "y": 700, + "w": 18, + "h": 22 + } + }, + { + "filename": "825s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 18 + }, + "frame": { + "x": 162, + "y": 722, + "w": 20, + "h": 18 + } + }, + { + "filename": "4618s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 22, + "h": 18 + }, + "frame": { + "x": 169, + "y": 530, + "w": 22, + "h": 18 + } + }, + { + "filename": "891s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 22 + }, + "frame": { + "x": 173, + "y": 548, + "w": 18, + "h": 22 + } + }, + { + "filename": "898", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 19, + "h": 22 + }, + "frame": { + "x": 173, + "y": 570, + "w": 19, + "h": 22 + } + }, + { + "filename": "831s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 19 + }, + "frame": { + "x": 173, + "y": 592, + "w": 20, + "h": 19 + } + }, + { + "filename": "4052s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 21, + "h": 21 + }, + "frame": { + "x": 172, + "y": 611, + "w": 21, + "h": 21 + } + }, + { + "filename": "898s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 19, + "h": 22 + }, + "frame": { + "x": 173, + "y": 632, + "w": 19, + "h": 22 + } + }, + { + "filename": "6705", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 6, + "w": 15, + "h": 22 + }, + "frame": { + "x": 191, + "y": 530, + "w": 15, + "h": 22 + } + }, { "filename": "4264", "rotated": false, @@ -6093,8 +6261,8 @@ "h": 20 }, "frame": { - "x": 192, - "y": 606, + "x": 206, + "y": 532, "w": 22, "h": 20 } @@ -6114,96 +6282,12 @@ "h": 20 }, "frame": { - "x": 214, - "y": 606, + "x": 228, + "y": 532, "w": 22, "h": 20 } }, - { - "filename": "6705s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 6, - "w": 15, - "h": 22 - }, - "frame": { - "x": 236, - "y": 613, - "w": 15, - "h": 22 - } - }, - { - "filename": "875-no-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 3, - "w": 14, - "h": 23 - }, - "frame": { - "x": 176, - "y": 654, - "w": 14, - "h": 23 - } - }, - { - "filename": "875s-no-ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 3, - "w": 14, - "h": 23 - }, - "frame": { - "x": 177, - "y": 677, - "w": 14, - "h": 23 - } - }, - { - "filename": "6549s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 16, - "h": 23 - }, - "frame": { - "x": 178, - "y": 700, - "w": 16, - "h": 23 - } - }, { "filename": "4263", "rotated": false, @@ -6218,221 +6302,11 @@ "w": 22, "h": 16 }, - "frame": { - "x": 192, - "y": 626, - "w": 22, - "h": 16 - } - }, - { - "filename": "4263s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 16 - }, - "frame": { - "x": 214, - "y": 626, - "w": 22, - "h": 16 - } - }, - { - "filename": "824s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 15, - "h": 21 - }, - "frame": { - "x": 236, - "y": 635, - "w": 15, - "h": 21 - } - }, - { - "filename": "850s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 21, - "h": 10 - }, - "frame": { - "x": 189, - "y": 642, - "w": 21, - "h": 10 - } - }, - { - "filename": "898", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 22 - }, - "frame": { - "x": 190, - "y": 652, - "w": 19, - "h": 22 - } - }, - { - "filename": "891", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 22 - }, "frame": { "x": 191, - "y": 674, - "w": 18, - "h": 22 - } - }, - { - "filename": "891s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 22 - }, - "frame": { - "x": 194, - "y": 696, - "w": 18, - "h": 22 - } - }, - { - "filename": "4562", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, + "y": 552, "w": 22, "h": 16 - }, - "frame": { - "x": 210, - "y": 642, - "w": 22, - "h": 16 - } - }, - { - "filename": "898s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 22 - }, - "frame": { - "x": 209, - "y": 658, - "w": 19, - "h": 22 - } - }, - { - "filename": "4562s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 22, - "h": 16 - }, - "frame": { - "x": 209, - "y": 680, - "w": 22, - "h": 16 - } - }, - { - "filename": "6570", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 18, - "h": 22 - }, - "frame": { - "x": 212, - "y": 696, - "w": 18, - "h": 22 } }, { @@ -6450,14 +6324,14 @@ "h": 20 }, "frame": { - "x": 230, - "y": 696, + "x": 192, + "y": 568, "w": 21, "h": 20 } }, { - "filename": "4222s", + "filename": "4144", "rotated": false, "trimmed": true, "sourceSize": { @@ -6467,14 +6341,14 @@ "spriteSourceSize": { "x": 9, "y": 5, - "w": 21, - "h": 20 + "w": 22, + "h": 19 }, "frame": { - "x": 230, - "y": 716, - "w": 21, - "h": 20 + "x": 213, + "y": 552, + "w": 22, + "h": 19 } }, { @@ -6492,35 +6366,14 @@ "h": 19 }, "frame": { - "x": 232, - "y": 656, + "x": 235, + "y": 552, "w": 19, "h": 19 } }, { - "filename": "848s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 18, - "h": 21 - }, - "frame": { - "x": 231, - "y": 675, - "w": 18, - "h": 21 - } - }, - { - "filename": "4618s", + "filename": "4144s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6529,99 +6382,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 6, + "y": 5, "w": 22, - "h": 18 + "h": 19 }, "frame": { - "x": 194, - "y": 718, + "x": 213, + "y": 571, "w": 22, - "h": 18 - } - }, - { - "filename": "6100", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 14, - "w": 14, - "h": 14 - }, - "frame": { - "x": 216, - "y": 718, - "w": 14, - "h": 14 - } - }, - { - "filename": "6058", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 99, - "y": 725, - "w": 21, - "h": 20 - } - }, - { - "filename": "6058s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 21, - "h": 20 - }, - "frame": { - "x": 120, - "y": 725, - "w": 21, - "h": 20 - } - }, - { - "filename": "6570s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 18, - "h": 22 - }, - "frame": { - "x": 141, - "y": 725, - "w": 18, - "h": 22 + "h": 19 } }, { @@ -6639,14 +6408,14 @@ "h": 19 }, "frame": { - "x": 159, - "y": 723, + "x": 235, + "y": 571, "w": 19, "h": 19 } }, { - "filename": "868", + "filename": "6570", "rotated": false, "trimmed": true, "sourceSize": { @@ -6656,18 +6425,18 @@ "spriteSourceSize": { "x": 12, "y": 6, - "w": 16, - "h": 17 + "w": 18, + "h": 22 }, "frame": { - "x": 178, - "y": 723, - "w": 16, - "h": 17 + "x": 193, + "y": 588, + "w": 18, + "h": 22 } }, { - "filename": "6215s", + "filename": "6570s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6676,17 +6445,206 @@ }, "spriteSourceSize": { "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 193, + "y": 610, + "w": 18, + "h": 22 + } + }, + { + "filename": "848s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 18, + "h": 21 + }, + "frame": { + "x": 192, + "y": 632, + "w": 18, + "h": 21 + } + }, + { + "filename": "4222s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 21, + "h": 20 + }, + "frame": { + "x": 211, + "y": 590, + "w": 21, + "h": 20 + } + }, + { + "filename": "4263s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 7, + "w": 22, + "h": 16 + }, + "frame": { + "x": 232, + "y": 590, + "w": 22, + "h": 16 + } + }, + { + "filename": "4562", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 16 + }, + "frame": { + "x": 232, + "y": 606, + "w": 22, + "h": 16 + } + }, + { + "filename": "6058", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 211, + "y": 610, + "w": 21, + "h": 20 + } + }, + { + "filename": "4562s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 22, + "h": 16 + }, + "frame": { + "x": 232, + "y": 622, + "w": 22, + "h": 16 + } + }, + { + "filename": "6705s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 6, + "w": 15, + "h": 22 + }, + "frame": { + "x": 177, + "y": 654, + "w": 15, + "h": 22 + } + }, + { + "filename": "877-hangry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, "w": 17, "h": 21 }, "frame": { - "x": 100, - "y": 745, + "x": 192, + "y": 653, "w": 17, "h": 21 } }, + { + "filename": "6058s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 211, + "y": 630, + "w": 21, + "h": 20 + } + }, { "filename": "837", "rotated": false, @@ -6702,12 +6660,411 @@ "h": 17 }, "frame": { - "x": 117, - "y": 745, + "x": 232, + "y": 638, "w": 20, "h": 17 } }, + { + "filename": "824", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 15, + "h": 21 + }, + "frame": { + "x": 176, + "y": 677, + "w": 15, + "h": 21 + } + }, + { + "filename": "824s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 15, + "h": 21 + }, + "frame": { + "x": 180, + "y": 698, + "w": 15, + "h": 21 + } + }, + { + "filename": "877", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 182, + "y": 719, + "w": 17, + "h": 21 + } + }, + { + "filename": "837s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 17 + }, + "frame": { + "x": 210, + "y": 650, + "w": 20, + "h": 17 + } + }, + { + "filename": "821", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 230, + "y": 655, + "w": 19, + "h": 16 + } + }, + { + "filename": "821s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 19, + "h": 16 + }, + "frame": { + "x": 209, + "y": 667, + "w": 19, + "h": 16 + } + }, + { + "filename": "852s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 228, + "y": 671, + "w": 19, + "h": 17 + } + }, + { + "filename": "829", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 18 + }, + "frame": { + "x": 192, + "y": 674, + "w": 17, + "h": 18 + } + }, + { + "filename": "871", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 209, + "y": 683, + "w": 19, + "h": 17 + } + }, + { + "filename": "871s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 17 + }, + "frame": { + "x": 228, + "y": 688, + "w": 19, + "h": 17 + } + }, + { + "filename": "6100", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 14, + "w": 14, + "h": 14 + }, + "frame": { + "x": 195, + "y": 692, + "w": 14, + "h": 14 + } + }, + { + "filename": "843", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 18, + "h": 19 + }, + "frame": { + "x": 209, + "y": 700, + "w": 18, + "h": 19 + } + }, + { + "filename": "843s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 18, + "h": 19 + }, + "frame": { + "x": 227, + "y": 705, + "w": 18, + "h": 19 + } + }, + { + "filename": "877s-hangry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 199, + "y": 719, + "w": 17, + "h": 21 + } + }, + { + "filename": "829s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 18 + }, + "frame": { + "x": 216, + "y": 724, + "w": 17, + "h": 18 + } + }, + { + "filename": "877s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 21 + }, + "frame": { + "x": 233, + "y": 724, + "w": 17, + "h": 21 + } + }, + { + "filename": "6215", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 149, + "y": 745, + "w": 17, + "h": 21 + } + }, + { + "filename": "6215s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 17, + "h": 21 + }, + "frame": { + "x": 166, + "y": 740, + "w": 17, + "h": 21 + } + }, + { + "filename": "868", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 16, + "h": 17 + }, + "frame": { + "x": 183, + "y": 740, + "w": 16, + "h": 17 + } + }, { "filename": "4554", "rotated": false, @@ -6723,96 +7080,12 @@ "h": 15 }, "frame": { - "x": 100, - "y": 766, + "x": 199, + "y": 740, "w": 17, "h": 15 } }, - { - "filename": "4554s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 15 - }, - "frame": { - "x": 105, - "y": 781, - "w": 17, - "h": 15 - } - }, - { - "filename": "843", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 18, - "h": 19 - }, - "frame": { - "x": 117, - "y": 762, - "w": 18, - "h": 19 - } - }, - { - "filename": "837s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 17 - }, - "frame": { - "x": 137, - "y": 747, - "w": 20, - "h": 17 - } - }, - { - "filename": "852s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 135, - "y": 764, - "w": 19, - "h": 17 - } - }, { "filename": "854", "rotated": false, @@ -6828,8 +7101,8 @@ "h": 14 }, "frame": { - "x": 122, - "y": 781, + "x": 216, + "y": 742, "w": 17, "h": 14 } @@ -6849,75 +7122,12 @@ "h": 14 }, "frame": { - "x": 139, - "y": 781, + "x": 233, + "y": 745, "w": 17, "h": 14 } }, - { - "filename": "871", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 159, - "y": 742, - "w": 19, - "h": 17 - } - }, - { - "filename": "843s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 18, - "h": 19 - }, - "frame": { - "x": 178, - "y": 740, - "w": 18, - "h": 19 - } - }, - { - "filename": "859s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 20 - }, - "frame": { - "x": 196, - "y": 736, - "w": 17, - "h": 20 - } - }, { "filename": "840", "rotated": false, @@ -6933,35 +7143,14 @@ "h": 17 }, "frame": { - "x": 154, - "y": 764, + "x": 155, + "y": 766, "w": 15, "h": 17 } }, { - "filename": "871s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 17 - }, - "frame": { - "x": 169, - "y": 759, - "w": 19, - "h": 17 - } - }, - { - "filename": "872", + "filename": "4554s", "rotated": false, "trimmed": true, "sourceSize": { @@ -6970,36 +7159,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 8, + "y": 7, "w": 17, - "h": 14 + "h": 15 }, "frame": { - "x": 156, - "y": 781, + "x": 155, + "y": 783, "w": 17, - "h": 14 - } - }, - { - "filename": "829", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 18 - }, - "frame": { - "x": 173, - "y": 776, - "w": 17, - "h": 18 + "h": 15 } }, { @@ -7017,33 +7185,12 @@ "h": 17 }, "frame": { - "x": 188, - "y": 759, + "x": 170, + "y": 761, "w": 15, "h": 17 } }, - { - "filename": "829s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 18 - }, - "frame": { - "x": 190, - "y": 776, - "w": 17, - "h": 18 - } - }, { "filename": "868s", "rotated": false, @@ -7059,33 +7206,12 @@ "h": 17 }, "frame": { - "x": 203, - "y": 756, + "x": 185, + "y": 757, "w": 16, "h": 17 } }, - { - "filename": "6101", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 16, - "h": 16 - }, - "frame": { - "x": 207, - "y": 773, - "w": 16, - "h": 16 - } - }, { "filename": "6100s", "rotated": false, @@ -7101,12 +7227,33 @@ "h": 14 }, "frame": { - "x": 216, - "y": 732, + "x": 201, + "y": 755, "w": 14, "h": 14 } }, + { + "filename": "872", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 14 + }, + "frame": { + "x": 215, + "y": 756, + "w": 17, + "h": 14 + } + }, { "filename": "872s", "rotated": false, @@ -7122,12 +7269,33 @@ "h": 14 }, "frame": { - "x": 230, - "y": 736, + "x": 232, + "y": 759, "w": 17, "h": 14 } }, + { + "filename": "6101", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 16, + "h": 16 + }, + "frame": { + "x": 172, + "y": 778, + "w": 16, + "h": 16 + } + }, { "filename": "6101s", "rotated": false, @@ -7143,8 +7311,8 @@ "h": 16 }, "frame": { - "x": 219, - "y": 750, + "x": 188, + "y": 774, "w": 16, "h": 16 } @@ -7155,6 +7323,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:a5e8bbe68acd6fa6a6192a11dcd3d8dd:daf54543be918b4f74a0d25a8e946ce0:8190d2ecf16422e962cfb1a751b5e1fc$" + "smartupdate": "$TexturePacker:SmartUpdate:76f12e2db074120d5e364d7bac497210:e1ea47956220c560d403105ff317eb1a:8190d2ecf16422e962cfb1a751b5e1fc$" } } diff --git a/public/images/pokemon_icons_8.png b/public/images/pokemon_icons_8.png index 0d2ddcec281..70b4e280ccb 100644 Binary files a/public/images/pokemon_icons_8.png and b/public/images/pokemon_icons_8.png differ diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 3954e48782e..c1faf6fef36 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -76,6 +76,8 @@ export const MOVE_OVERRIDE = Moves.NONE; export const OPP_SPECIES_OVERRIDE = 0; export const OPP_ABILITY_OVERRIDE = Abilities.NONE; export const OPP_MOVE_OVERRIDE = Moves.NONE; +export const OPP_SHINY_OVERRIDE = false; +export const OPP_VARIANT_OVERRIDE = 0; const DEBUG_RNG = false; @@ -1058,6 +1060,7 @@ export default class BattleScene extends SceneBase { case Species.FLABEBE: case Species.FLOETTE: case Species.FLORGES: + case Species.FURFROU: case Species.ORICORIO: case Species.SQUAWKABILLY: case Species.TATSUGIRI: @@ -1065,6 +1068,8 @@ export default class BattleScene extends SceneBase { return Utils.randSeedInt(species.forms.length); case Species.MINIOR: return Utils.randSeedInt(6); + case Species.ALCREMIE: + return Utils.randSeedInt(9); case Species.MEOWSTIC: case Species.INDEEDEE: case Species.BASCULEGION: diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index b12d15968f6..aaab9f9a4a2 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -276,6 +276,10 @@ export class SeedTag extends BattlerTag { super(BattlerTagType.SEEDED, BattlerTagLapseType.TURN_END, 1, Moves.LEECH_SEED, sourceId); } + canAdd(pokemon: Pokemon): boolean { + return !pokemon.isOfType(Type.GRASS); + } + onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); diff --git a/src/data/move.ts b/src/data/move.ts index 9329d21c1d4..30c97a1ac8d 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2466,7 +2466,7 @@ export class FrenzyAttr extends MoveEffectAttr { if (!user.getMoveQueue().length) { if (!user.getTag(BattlerTagType.FRENZY)) { - const turnCount = user.randSeedIntRange(2, 3); + const turnCount = user.randSeedIntRange(1, 2); new Array(turnCount).fill(null).map(() => user.getMoveQueue().push({ move: move.id, targets: [ target.getBattlerIndex() ], ignorePP: true })); user.addTag(BattlerTagType.FRENZY, 1, move.id, user.id); } else { diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 0c1dfe06ca1..0d09277ad47 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -1421,7 +1421,15 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesFormEvolution(Species.POLTEAGEIST, 'antique', 'antique', 1, EvolutionItem.CHIPPED_POT, null, SpeciesWildEvolutionDelay.LONG) ], [Species.MILCERY]: [ - new SpeciesEvolution(Species.ALCREMIE, 1, EvolutionItem.STRAWBERRY_SWEET, null, SpeciesWildEvolutionDelay.LONG) + new SpeciesFormEvolution(Species.ALCREMIE, '', 'vanilla-cream', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.TOWN || p.scene.arena.biomeType === Biome.PLAINS || p.scene.arena.biomeType === Biome.GRASS || p.scene.arena.biomeType === Biome.TALL_GRASS || p.scene.arena.biomeType === Biome.METROPOLIS), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'ruby-cream', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.BADLANDS || p.scene.arena.biomeType === Biome.VOLCANO || p.scene.arena.biomeType === Biome.GRAVEYARD || p.scene.arena.biomeType === Biome.FACTORY || p.scene.arena.biomeType === Biome.SLUM), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'matcha-cream', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.FOREST || p.scene.arena.biomeType === Biome.SWAMP || p.scene.arena.biomeType === Biome.MEADOW || p.scene.arena.biomeType === Biome.JUNGLE), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'mint-cream', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.SEA || p.scene.arena.biomeType === Biome.BEACH || p.scene.arena.biomeType === Biome.LAKE || p.scene.arena.biomeType === Biome.SEABED), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'lemon-cream', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.DESERT || p.scene.arena.biomeType === Biome.POWER_PLANT || p.scene.arena.biomeType === Biome.DOJO || p.scene.arena.biomeType === Biome.RUINS || p.scene.arena.biomeType === Biome.CONSTRUCTION_SITE), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'salted-cream', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.MOUNTAIN || p.scene.arena.biomeType === Biome.CAVE || p.scene.arena.biomeType === Biome.ICE_CAVE || p.scene.arena.biomeType === Biome.FAIRY_CAVE || p.scene.arena.biomeType === Biome.SNOWY_FOREST), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'ruby-swirl', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.WASTELAND || p.scene.arena.biomeType === Biome.LABORATORY), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'caramel-swirl', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.TEMPLE || p.scene.arena.biomeType === Biome.ISLAND), SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.ALCREMIE, '', 'rainbow-swirl', 1, EvolutionItem.STRAWBERRY_SWEET, new SpeciesEvolutionCondition(p => p.scene.arena.biomeType === Biome.ABYSS || p.scene.arena.biomeType === Biome.SPACE || p.scene.arena.biomeType === Biome.END), SpeciesWildEvolutionDelay.LONG) ], [Species.DURALUDON]: [ new SpeciesFormEvolution(Species.ARCHALUDON, '', '', 1, EvolutionItem.METAL_ALLOY, null, SpeciesWildEvolutionDelay.VERY_LONG) diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index e8dbef822d5..421488629ae 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -630,7 +630,15 @@ export const pokemonFormChanges: PokemonFormChanges = { new SpeciesFormChange(Species.GRIMMSNARL, '', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)) ], [Species.ALCREMIE]: [ - new SpeciesFormChange(Species.ALCREMIE, 'vanilla-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)) + new SpeciesFormChange(Species.ALCREMIE, 'vanilla-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'ruby-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'matcha-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'mint-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'lemon-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'salted-cream', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'ruby-swirl', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'caramel-swirl', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)), + new SpeciesFormChange(Species.ALCREMIE, 'rainbow-swirl', SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)) ], [Species.MORPEKO]: [ new SpeciesFormChange(Species.MORPEKO, 'full-belly', 'hangry', new SpeciesFormChangeManualTrigger(), true), diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 8be93672f34..f1c1e8bbbe2 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1855,15 +1855,15 @@ export function initSpecies() { new PokemonSpecies(Species.PANGORO, 6, false, false, false, "Daunting Pokémon", Type.FIGHTING, Type.DARK, 2.1, 136, Abilities.IRON_FIST, Abilities.MOLD_BREAKER, Abilities.SCRAPPY, 495, 95, 124, 78, 69, 71, 58, 65, 50, 173, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.FURFROU, 6, false, false, false, "Poodle Pokémon", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, GrowthRate.MEDIUM_FAST, 50, false, true, new PokemonForm("Natural Form", "", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165), - new PokemonForm("Heart Trim", "heart", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Star Trim", "star", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Diamond Trim", "diamond", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Debutante Trim", "debutante", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Matron Trim", "matron", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Dandy Trim", "dandy", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("La Reine Trim", "la-reine", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Kabuki Trim", "kabuki", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), - new PokemonForm("Pharaoh Trim", "pharaoh", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false, ""), + new PokemonForm("Heart Trim", "heart", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Star Trim", "star", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Diamond Trim", "diamond", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Debutante Trim", "debutante", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Matron Trim", "matron", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Dandy Trim", "dandy", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("La Reine Trim", "la-reine", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Kabuki Trim", "kabuki", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), + new PokemonForm("Pharaoh Trim", "pharaoh", Type.NORMAL, null, 1.2, 28, Abilities.FUR_COAT, Abilities.NONE, Abilities.NONE, 472, 75, 80, 60, 65, 90, 102, 160, 70, 165, false), ), new PokemonSpecies(Species.ESPURR, 6, false, false, false, "Restraint Pokémon", Type.PSYCHIC, null, 0.3, 3.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.OWN_TEMPO, 355, 62, 48, 54, 63, 60, 68, 190, 50, 71, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.MEOWSTIC, 6, false, false, false, "Constraint Pokémon", Type.PSYCHIC, null, 0.6, 8.5, Abilities.KEEN_EYE, Abilities.INFILTRATOR, Abilities.PRANKSTER, 466, 74, 48, 76, 83, 81, 104, 75, 50, 163, GrowthRate.MEDIUM_FAST, 50, false, false, @@ -2209,14 +2209,14 @@ export function initSpecies() { new PokemonSpecies(Species.MILCERY, 8, false, false, false, "Cream Pokémon", Type.FAIRY, null, 0.2, 0.3, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 270, 45, 40, 40, 50, 61, 34, 200, 50, 54, GrowthRate.MEDIUM_FAST, 0, false), new PokemonSpecies(Species.ALCREMIE, 8, false, false, false, "Cream Pokémon", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, GrowthRate.MEDIUM_FAST, 0, false, true, new PokemonForm("Vanilla Cream", "vanilla-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Ruby Cream", "ruby-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Matcha Cream", "matcha-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Mint Cream", "mint-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Lemon Cream", "lemon-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Salted Cream", "salted-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Ruby Swirl", "ruby-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Caramel Swirl", "caramel-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), - new PokemonForm("Rainbow Swirl", "rainbow-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, ""), + new PokemonForm("Ruby Cream", "ruby-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Matcha Cream", "matcha-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Mint Cream", "mint-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Lemon Cream", "lemon-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Salted Cream", "salted-cream", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Ruby Swirl", "ruby-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Caramel Swirl", "caramel-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), + new PokemonForm("Rainbow Swirl", "rainbow-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false), new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FAIRY, null, 30, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 595, 80, 70, 85, 140, 150, 65, 100, 50, 173), ), new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", Type.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false), diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts index a1c83af0779..4cf025e3650 100644 --- a/src/data/trainer-names.ts +++ b/src/data/trainer-names.ts @@ -106,7 +106,7 @@ export const trainerNamePools = { [TrainerType.RANGER]: [["Carlos","Jackson","Sebastian","Gav","Lorenzo","Logan","Nicolas","Trenton","Deshawn","Dwayne","Jeffery","Kyler","Taylor","Alain","Claude","Crofton","Forrest","Harry","Jaden","Keith","Lewis","Miguel","Pedro","Ralph","Richard","Bret","Daryl","Eddie","Johan","Leaf","Louis","Maxwell","Parker","Rick","Steve","Bjorn","Chaise","Dean","Lee","Maurice","Nash","Ralf","Reed","Shinobu","Silas"],["Catherine","Jenna","Sophia","Merdith","Nora","Beth","Chelsea","Katelyn","Madeline","Allison","Ashlee","Felicia","Krista","Annie","Audra","Brenda","Chloris","Eliza","Heidi","Irene","Mary","Mylene","Shanti","Shelly","Thalia","Anja","Briana","Dianna","Elaine","Elle","Hillary","Katie","Lena","Lois","Malory","Melita","Mikiko","Naoko","Serenity","Ambre","Brooke","Clementine","Melina","Petra","Twiggy"]], [TrainerType.RICH]: [["Alfred","Edward","Gregory","Preston","Thomas","Tucker","Walter","Clifford","Everett","Micah","Nate","Pierre","Terrance","Arthur","Brooks","Emanuel","Lamar","Jeremy","Leonardo","Milton","Frederic","Renaud","Robert","Yan","Daniel","Sheldon","Stonewall","Gerald","Ronald","Smith","Stanley","Reginald","Orson","Wilco","Caden","Glenn"],["Rebecca","Reina","Cassandra","Emilia","Grace","Marian","Elizabeth","Kathleen","Sayuri","Caroline","Judy"]], [TrainerType.RICH_KID]: [["Garret","Winston","Dawson","Enrique","Jason","Roman","Trey","Liam","Anthony","Brad","Cody","Manuel","Martin","Pierce","Rolan","Keenan","Filbert","Antoin","Cyus","Diek","Dugo","Flitz","Jurek","Lond","Perd","Quint","Basto","Benit","Brot","Denc","Guyit","Marcon","Perc","Puros","Roex","Sainz","Symin","Tark","Venak"],["Anette","Brianna","Cindy","Colleen","Daphne","Elizabeth","Naomi","Sarah","Charlotte","Gillian","Jacki","Lady","Melissa","Celeste","Colette","Elizandra","Isabel","Lynette","Magnolia","Sophie","Lina","Dulcie","Auro","Brin","Caril","Eloos","Gwin","Illa","Kowly","Rima","Ristin","Vesey","Brena","Deasy","Denslon","Kylet","Nemi","Rene","Sanol","Stouner","Sturk","Talmen","Zoila"]], - [TrainerType.ROUGHNECK]: ["Camron","Corey","Gabriel","Isaiah","Jamal","Koji","Luke","Paxton","Raul","Zeek","Kirby","Chance","Dave","Fletcher","Johnny","Reese","Joey","Roughneck","Ricky","Silvester","Martin"], + [TrainerType.ROUGHNECK]: ["Camron","Corey","Gabriel","Isaiah","Jamal","Koji","Luke","Paxton","Raul","Zeek","Kirby","Chance","Dave","Fletcher","Johnny","Reese","Joey","Ricky","Silvester","Martin"], [TrainerType.SCIENTIST]: [["Jed","Marc","Mitch","Rich","Ross","Beau","Braydon","Connor","Ed","Ivan","Jerry","Jose","Joshua","Parker","Rodney","Taylor","Ted","Travis","Zackery","Darrius","Emilio","Fredrick","Shaun","Stefano","Travon","Daniel","Garett","Gregg","Linden","Lowell","Trenton","Dudley","Luke","Markus","Nathan","Orville","Randall","Ron","Ronald","Simon","Steve","William","Franklin","Clarke","Jacques","Terrance","Ernst","Justus","Ikaika","Jayson","Kyle","Reid","Tyrone","Adam","Albert","Alphonse","Cory","Donnie","Elton","Francis","Gordon","Herbert","Humphrey","Jordan","Julian","Keaton","Levi","Melvin","Murray","West","Craig","Coren","Dubik","Kotan","Lethco","Mante","Mort","Myron","Odlow","Ribek","Roeck","Vogi","Vonder","Zogo","Doimo","Doton","Durel","Hildon","Kukla","Messa","Nanot","Platen","Raburn","Reman","Acrod","Coffy","Elrok","Foss","Hardig","Hombol","Hospel","Kaller","Klots","Krilok","Limar","Loket","Mesak","Morbit","Newin","Orill","Tabor","Tekot"],["Blythe","Chan","Kathrine","Marie","Maria","Naoko","Samantha","Satomi","Shannon","Athena","Caroline","Lumi","Lumina","Marissa","Sonia"]], [TrainerType.SMASHER]: ["Aspen","Elena","Mari","Amy","Lizzy"], [TrainerType.SNOW_WORKER]: [["Braden","Brendon","Colin","Conrad","Dillan","Gary","Gerardo","Holden","Jackson","Mason","Quentin","Willy","Noel","Arnold","Brady","Brand","Cairn","Cliff","Don","Eddie","Felix","Filipe","Glenn","Gus","Heath","Matthew","Patton","Rich","Rob","Ryan","Scott","Shelby","Sterling","Tyler","Victor","Zack","Friedrich","Herman","Isaac","Leo","Maynard","Mitchell","Morgann","Nathan","Niel","Pasqual","Paul","Tavarius","Tibor","Dimitri","Narek","Yusif","Frank","Jeff","Vaclav","Ovid","Francis","Keith","Russel","Sangon","Toway","Bomber","Chean","Demit","Hubor","Kebile","Laber","Ordo","Retay","Ronix","Wagel","Dobit","Kaster","Lobel","Releo","Saken","Rustix"],["Georgia","Sandra","Yvonne"]], diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index d834ffb35b0..4e20bad407b 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1,5 +1,5 @@ import Phaser from 'phaser'; -import BattleScene, { ABILITY_OVERRIDE, AnySound, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE } from '../battle-scene'; +import BattleScene, { ABILITY_OVERRIDE, AnySound, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../battle-scene'; import { Variant, VariantSet, variantColorCache } from '#app/data/variant'; import { variantData } from '#app/data/variant'; import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info'; @@ -997,11 +997,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let shinyThreshold = new Utils.IntegerHolder(32); if (thresholdOverride === undefined) { - if (!this.hasTrainer()) { - if (new Date() < new Date('4/29/2024')) - shinyThreshold.value *= 2; + if (!this.hasTrainer()) this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); - } } else shinyThreshold.value = thresholdOverride; @@ -2549,9 +2546,15 @@ export class EnemyPokemon extends Pokemon { this.generateAndPopulateMoveset(); this.trySetShiny(); - - if (this.shiny) + if (OPP_SHINY_OVERRIDE) { + this.shiny = true; + this.initShinySparkle(); + } + if (this.shiny) { this.variant = this.generateVariant(); + if (OPP_VARIANT_OVERRIDE) + this.variant = OPP_VARIANT_OVERRIDE; + } this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); diff --git a/src/locales/de/pokemon.ts b/src/locales/de/pokemon.ts index 09be8894eb4..08fdbf01d02 100644 --- a/src/locales/de/pokemon.ts +++ b/src/locales/de/pokemon.ts @@ -1,380 +1,380 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const pokemon: SimpleTranslationEntries = { - "bulbasaur": "Bulbasaur", - "ivysaur": "Ivysaur", - "venusaur": "Venusaur", - "charmander": "Charmander", - "charmeleon": "Charmeleon", - "charizard": "Charizard", - "squirtle": "Squirtle", - "wartortle": "Wartortle", - "blastoise": "Blastoise", - "caterpie": "Caterpie", - "metapod": "Metapod", - "butterfree": "Butterfree", - "weedle": "Weedle", - "kakuna": "Kakuna", - "beedrill": "Beedrill", - "pidgey": "Pidgey", - "pidgeotto": "Pidgeotto", - "pidgeot": "Pidgeot", - "rattata": "Rattata", - "raticate": "Raticate", - "spearow": "Spearow", - "fearow": "Fearow", - "ekans": "Ekans", + "bulbasaur": "Bisasam", + "ivysaur": "Bisaknosp", + "venusaur": "Bisaflor", + "charmander": "Glumanda", + "charmeleon": "Glutexo", + "charizard": "Glurak", + "squirtle": "Schiggy", + "wartortle": "Schillok", + "blastoise": "Turtok", + "caterpie": "Raupy", + "metapod": "Safcon", + "butterfree": "Smettbo", + "weedle": "Hornliu", + "kakuna": "Kokuna", + "beedrill": "Bibor", + "pidgey": "Taubsi", + "pidgeotto": "Tauboga", + "pidgeot": "Tauboss", + "rattata": "Rattfratz", + "raticate": "Rattikarl", + "spearow": "Habitak", + "fearow": "Ibitak", + "ekans": "Rettan", "arbok": "Arbok", "pikachu": "Pikachu", "raichu": "Raichu", - "sandshrew": "Sandshrew", - "sandslash": "Sandslash", + "sandshrew": "Sandan", + "sandslash": "Sandamer", "nidoran_f": "Nidoran♀", "nidorina": "Nidorina", "nidoqueen": "Nidoqueen", "nidoran_m": "Nidoran♂", "nidorino": "Nidorino", "nidoking": "Nidoking", - "clefairy": "Clefairy", - "clefable": "Clefable", + "clefairy": "Piepi", + "clefable": "Pixi", "vulpix": "Vulpix", - "ninetales": "Ninetales", - "jigglypuff": "Jigglypuff", - "wigglytuff": "Wigglytuff", + "ninetales": "Vulnona", + "jigglypuff": "Pummeluff", + "wigglytuff": "Knuddeluff", "zubat": "Zubat", "golbat": "Golbat", - "oddish": "Oddish", - "gloom": "Gloom", - "vileplume": "Vileplume", + "oddish": "Myrapla", + "gloom": "Duflor", + "vileplume": "Giflor", "paras": "Paras", - "parasect": "Parasect", - "venonat": "Venonat", - "venomoth": "Venomoth", - "diglett": "Diglett", - "dugtrio": "Dugtrio", - "meowth": "Meowth", - "persian": "Persian", - "psyduck": "Psyduck", - "golduck": "Golduck", - "mankey": "Mankey", - "primeape": "Primeape", - "growlithe": "Growlithe", - "arcanine": "Arcanine", - "poliwag": "Poliwag", - "poliwhirl": "Poliwhirl", - "poliwrath": "Poliwrath", + "parasect": "Parasek", + "venonat": "Bluzuk", + "venomoth": "Omot", + "diglett": "Digda", + "dugtrio": "Digdri", + "meowth": "Mauzi", + "persian": "Snobilikat", + "psyduck": "Enton", + "golduck": "Entoron", + "mankey": "Menki", + "primeape": "Rasaff", + "growlithe": "Fukano", + "arcanine": "Arkani", + "poliwag": "Quapsel", + "poliwhirl": "Quaputzi", + "poliwrath": "Quappo", "abra": "Abra", "kadabra": "Kadabra", - "alakazam": "Alakazam", - "machop": "Machop", - "machoke": "Machoke", - "machamp": "Machamp", - "bellsprout": "Bellsprout", - "weepinbell": "Weepinbell", - "victreebel": "Victreebel", - "tentacool": "Tentacool", - "tentacruel": "Tentacruel", - "geodude": "Geodude", - "graveler": "Graveler", - "golem": "Golem", - "ponyta": "Ponyta", - "rapidash": "Rapidash", - "slowpoke": "Slowpoke", - "slowbro": "Slowbro", - "magnemite": "Magnemite", + "alakazam": "Simsala", + "machop": "Machollo", + "machoke": "Maschock", + "machamp": "Machomei", + "bellsprout": "Knofensa", + "weepinbell": "Ultrigaria", + "victreebel": "Sarzenia", + "tentacool": "Tentacha", + "tentacruel": "Tentoxa", + "geodude": "Kleinstein", + "graveler": "Georok", + "golem": "Geowaz", + "ponyta": "Ponita", + "rapidash": "Gallopa", + "slowpoke": "Flegmon", + "slowbro": "Lahmus", + "magnemite": "Magnetilo", "magneton": "Magneton", - "farfetchd": "Farfetch'd", - "doduo": "Doduo", - "dodrio": "Dodrio", - "seel": "Seel", - "dewgong": "Dewgong", - "grimer": "Grimer", - "muk": "Muk", - "shellder": "Shellder", - "cloyster": "Cloyster", - "gastly": "Gastly", - "haunter": "Haunter", + "farfetchd": "Porenta", + "doduo": "Dodu", + "dodrio": "Dodri", + "seel": "Jurob", + "dewgong": "Jugong", + "grimer": "Sleima", + "muk": "Sleimok", + "shellder": "Muschas", + "cloyster": "Austos", + "gastly": "Nebulak", + "haunter": "Alpollo", "gengar": "Gengar", "onix": "Onix", - "drowzee": "Drowzee", + "drowzee": "Traumato", "hypno": "Hypno", "krabby": "Krabby", "kingler": "Kingler", - "voltorb": "Voltorb", - "electrode": "Electrode", - "exeggcute": "Exeggcute", - "exeggutor": "Exeggutor", - "cubone": "Cubone", - "marowak": "Marowak", - "hitmonlee": "Hitmonlee", - "hitmonchan": "Hitmonchan", - "lickitung": "Lickitung", - "koffing": "Koffing", - "weezing": "Weezing", - "rhyhorn": "Rhyhorn", - "rhydon": "Rhydon", - "chansey": "Chansey", + "voltorb": "Voltobal", + "electrode": "Lektrobal", + "exeggcute": "Owei", + "exeggutor": "Kokowei", + "cubone": "Tragosso", + "marowak": "Knogga", + "hitmonlee": "Kicklee", + "hitmonchan": "Nockchan", + "lickitung": "Schlurp", + "koffing": "Smogon", + "weezing": "Smogmog", + "rhyhorn": "Rihorn", + "rhydon": "Rizeros", + "chansey": "Chaneira", "tangela": "Tangela", - "kangaskhan": "Kangaskhan", - "horsea": "Horsea", - "seadra": "Seadra", - "goldeen": "Goldeen", - "seaking": "Seaking", - "staryu": "Staryu", + "kangaskhan": "Kangama", + "horsea": "Seeper", + "seadra": "Seemon", + "goldeen": "Goldini", + "seaking": "Golking", + "staryu": "Sterndu", "starmie": "Starmie", - "mr_mime": "Mr. Mime", - "scyther": "Scyther", - "jynx": "Jynx", - "electabuzz": "Electabuzz", + "mr_mime": "Pantimos", + "scyther": "Sichlor", + "jynx": "Rossana", + "electabuzz": "Elektek", "magmar": "Magmar", "pinsir": "Pinsir", "tauros": "Tauros", - "magikarp": "Magikarp", - "gyarados": "Gyarados", + "magikarp": "Karpador", + "gyarados": "Garados", "lapras": "Lapras", "ditto": "Ditto", - "eevee": "Eevee", - "vaporeon": "Vaporeon", - "jolteon": "Jolteon", - "flareon": "Flareon", + "eevee": "Evoli", + "vaporeon": "Aquana", + "jolteon": "Blitza", + "flareon": "Flamara", "porygon": "Porygon", - "omanyte": "Omanyte", - "omastar": "Omastar", + "omanyte": "Amonitas", + "omastar": "Amoroso", "kabuto": "Kabuto", "kabutops": "Kabutops", "aerodactyl": "Aerodactyl", - "snorlax": "Snorlax", - "articuno": "Articuno", + "snorlax": "Relaxo", + "articuno": "Arktos", "zapdos": "Zapdos", - "moltres": "Moltres", + "moltres": "Lavados", "dratini": "Dratini", - "dragonair": "Dragonair", - "dragonite": "Dragonite", - "mewtwo": "Mewtwo", + "dragonair": "Dragonir", + "dragonite": "Dragoran", + "mewtwo": "Mewtu", "mew": "Mew", - "chikorita": "Chikorita", - "bayleef": "Bayleef", - "meganium": "Meganium", - "cyndaquil": "Cyndaquil", - "quilava": "Quilava", - "typhlosion": "Typhlosion", - "totodile": "Totodile", - "croconaw": "Croconaw", - "feraligatr": "Feraligatr", - "sentret": "Sentret", - "furret": "Furret", + "chikorita": "Endivie", + "bayleef": "Lorblatt", + "meganium": "Meganie", + "cyndaquil": "Feurigel", + "quilava": "Igelavar", + "typhlosion": "Tornupto", + "totodile": "Karnimani", + "croconaw": "Tyracroc", + "feraligatr": "Impergator", + "sentret": "Wiesor", + "furret": "Wiesenior", "hoothoot": "Hoothoot", - "noctowl": "Noctowl", + "noctowl": "Noctuh", "ledyba": "Ledyba", "ledian": "Ledian", - "spinarak": "Spinarak", + "spinarak": "Webarak", "ariados": "Ariados", - "crobat": "Crobat", - "chinchou": "Chinchou", + "crobat": "Iksbat", + "chinchou": "Lampi", "lanturn": "Lanturn", "pichu": "Pichu", - "cleffa": "Cleffa", - "igglybuff": "Igglybuff", + "cleffa": "Pii", + "igglybuff": "Fluffeluff", "togepi": "Togepi", "togetic": "Togetic", "natu": "Natu", "xatu": "Xatu", - "mareep": "Mareep", - "flaaffy": "Flaaffy", + "mareep": "Voltilamm", + "flaaffy": "Waaty", "ampharos": "Ampharos", - "bellossom": "Bellossom", + "bellossom": "Blubella", "marill": "Marill", "azumarill": "Azumarill", - "sudowoodo": "Sudowoodo", - "politoed": "Politoed", - "hoppip": "Hoppip", - "skiploom": "Skiploom", - "jumpluff": "Jumpluff", - "aipom": "Aipom", - "sunkern": "Sunkern", - "sunflora": "Sunflora", + "sudowoodo": "Mogelbaum", + "politoed": "Quaxo", + "hoppip": "Hoppspross", + "skiploom": "Hubelupf", + "jumpluff": "Papungha", + "aipom": "Griffel", + "sunkern": "Sonnkern", + "sunflora": "Sonnflora", "yanma": "Yanma", - "wooper": "Wooper", - "quagsire": "Quagsire", - "espeon": "Espeon", - "umbreon": "Umbreon", - "murkrow": "Murkrow", - "slowking": "Slowking", - "misdreavus": "Misdreavus", - "unown": "Unown", - "wobbuffet": "Wobbuffet", + "wooper": "Felino", + "quagsire": "Morlord", + "espeon": "Psiana", + "umbreon": "Nachtara", + "murkrow": "Kramurx", + "slowking": "Laschoking", + "misdreavus": "Traunfugil", + "unown": "Icognito", + "wobbuffet": "Woingenau", "girafarig": "Girafarig", - "pineco": "Pineco", - "forretress": "Forretress", - "dunsparce": "Dunsparce", - "gligar": "Gligar", - "steelix": "Steelix", + "pineco": "Tannza", + "forretress": "Forstellka", + "dunsparce": "Dummisel", + "gligar": "Skorgla", + "steelix": "Stahlos", "snubbull": "Snubbull", "granbull": "Granbull", - "qwilfish": "Qwilfish", - "scizor": "Scizor", - "shuckle": "Shuckle", - "heracross": "Heracross", - "sneasel": "Sneasel", + "qwilfish": "Baldorfish", + "scizor": "Scherox", + "shuckle": "Pottrott", + "heracross": "Skaraborn", + "sneasel": "Sniebel", "teddiursa": "Teddiursa", "ursaring": "Ursaring", - "slugma": "Slugma", + "slugma": "Schneckmag", "magcargo": "Magcargo", - "swinub": "Swinub", - "piloswine": "Piloswine", - "corsola": "Corsola", + "swinub": "Quiekel", + "piloswine": "Keifel", + "corsola": "Corasonn", "remoraid": "Remoraid", "octillery": "Octillery", - "delibird": "Delibird", - "mantine": "Mantine", - "skarmory": "Skarmory", - "houndour": "Houndour", - "houndoom": "Houndoom", - "kingdra": "Kingdra", + "delibird": "Botogel", + "mantine": "Mantax", + "skarmory": "Panzaeron", + "houndour": "Hunduster", + "houndoom": "Hundemon", + "kingdra": "Seedraking", "phanpy": "Phanpy", "donphan": "Donphan", "porygon2": "Porygon2", - "stantler": "Stantler", - "smeargle": "Smeargle", - "tyrogue": "Tyrogue", - "hitmontop": "Hitmontop", - "smoochum": "Smoochum", + "stantler": "Damhirplex", + "smeargle": "Farbeagle", + "tyrogue": "Rabauz", + "hitmontop": "Kapoera", + "smoochum": "Kussilla", "elekid": "Elekid", "magby": "Magby", "miltank": "Miltank", - "blissey": "Blissey", + "blissey": "Heiteira", "raikou": "Raikou", "entei": "Entei", "suicune": "Suicune", "larvitar": "Larvitar", "pupitar": "Pupitar", - "tyranitar": "Tyranitar", + "tyranitar": "Despotar", "lugia": "Lugia", "ho_oh": "Ho-Oh", "celebi": "Celebi", - "treecko": "Treecko", - "grovyle": "Grovyle", - "sceptile": "Sceptile", - "torchic": "Torchic", - "combusken": "Combusken", - "blaziken": "Blaziken", - "mudkip": "Mudkip", - "marshtomp": "Marshtomp", - "swampert": "Swampert", - "poochyena": "Poochyena", - "mightyena": "Mightyena", - "zigzagoon": "Zigzagoon", - "linoone": "Linoone", - "wurmple": "Wurmple", - "silcoon": "Silcoon", - "beautifly": "Beautifly", - "cascoon": "Cascoon", - "dustox": "Dustox", - "lotad": "Lotad", - "lombre": "Lombre", - "ludicolo": "Ludicolo", - "seedot": "Seedot", - "nuzleaf": "Nuzleaf", - "shiftry": "Shiftry", - "taillow": "Taillow", - "swellow": "Swellow", + "treecko": "Geckarbor", + "grovyle": "Reptain", + "sceptile": "Gewaldro", + "torchic": "Flemmli", + "combusken": "Jungglut", + "blaziken": "Lohgock", + "mudkip": "Hydropi", + "marshtomp": "Moorabbel", + "swampert": "Sumpex", + "poochyena": "Fiffyen", + "mightyena": "Magnayen", + "zigzagoon": "Zigzachs", + "linoone": "Geradaks", + "wurmple": "Waumpel", + "silcoon": "Schaloko", + "beautifly": "Papinella", + "cascoon": "Panekon", + "dustox": "Pudox", + "lotad": "Loturzel", + "lombre": "Lombrero", + "ludicolo": "Kappalores", + "seedot": "Samurzel", + "nuzleaf": "Blanas", + "shiftry": "Tengulist", + "taillow": "Schwalbini", + "swellow": "Schwalboss", "wingull": "Wingull", "pelipper": "Pelipper", - "ralts": "Ralts", + "ralts": "Trasla", "kirlia": "Kirlia", "gardevoir": "Gardevoir", - "surskit": "Surskit", - "masquerain": "Masquerain", - "shroomish": "Shroomish", - "breloom": "Breloom", - "slakoth": "Slakoth", - "vigoroth": "Vigoroth", - "slaking": "Slaking", + "surskit": "Geweiher", + "masquerain": "Maskeregen", + "shroomish": "Knilz", + "breloom": "Kapilz", + "slakoth": "Bummelz", + "vigoroth": "Muntier", + "slaking": "Letarking", "nincada": "Nincada", "ninjask": "Ninjask", - "shedinja": "Shedinja", - "whismur": "Whismur", - "loudred": "Loudred", - "exploud": "Exploud", + "shedinja": "Ninjatom", + "whismur": "Flurmel", + "loudred": "Krakeelo", + "exploud": "Krawumms", "makuhita": "Makuhita", "hariyama": "Hariyama", "azurill": "Azurill", - "nosepass": "Nosepass", - "skitty": "Skitty", - "delcatty": "Delcatty", - "sableye": "Sableye", - "mawile": "Mawile", - "aron": "Aron", - "lairon": "Lairon", - "aggron": "Aggron", + "nosepass": "Nasgnet", + "skitty": "Eneco", + "delcatty": "Enekoro", + "sableye": "Zobiris", + "mawile": "Flunkifer", + "aron": "Stollunior", + "lairon": "Stollrak", + "aggron": "Stolloss", "meditite": "Meditite", - "medicham": "Medicham", - "electrike": "Electrike", - "manectric": "Manectric", + "medicham": "Meditalis", + "electrike": "Frizelbliz", + "manectric": "Voltenso", "plusle": "Plusle", "minun": "Minun", "volbeat": "Volbeat", "illumise": "Illumise", "roselia": "Roselia", - "gulpin": "Gulpin", - "swalot": "Swalot", - "carvanha": "Carvanha", - "sharpedo": "Sharpedo", + "gulpin": "Schluppuck", + "swalot": "Schluckwech", + "carvanha": "Kanivanha", + "sharpedo": "Tohaido", "wailmer": "Wailmer", "wailord": "Wailord", - "numel": "Numel", + "numel": "Camaub", "camerupt": "Camerupt", - "torkoal": "Torkoal", + "torkoal": "Qurtel", "spoink": "Spoink", - "grumpig": "Grumpig", - "spinda": "Spinda", - "trapinch": "Trapinch", + "grumpig": "Groink", + "spinda": "Pandir", + "trapinch": "Knacklion", "vibrava": "Vibrava", - "flygon": "Flygon", - "cacnea": "Cacnea", - "cacturne": "Cacturne", - "swablu": "Swablu", + "flygon": "Libelldra", + "cacnea": "Tuska", + "cacturne": "Noktuska", + "swablu": "Wablu", "altaria": "Altaria", - "zangoose": "Zangoose", - "seviper": "Seviper", - "lunatone": "Lunatone", - "solrock": "Solrock", - "barboach": "Barboach", - "whiscash": "Whiscash", - "corphish": "Corphish", - "crawdaunt": "Crawdaunt", - "baltoy": "Baltoy", - "claydol": "Claydol", - "lileep": "Lileep", - "cradily": "Cradily", + "zangoose": "Sengo", + "seviper": "Vipitis", + "lunatone": "Lunastein", + "solrock": "Sonnfel", + "barboach": "Schmerbe", + "whiscash": "Welsar", + "corphish": "Krebscorps", + "crawdaunt": "Krebutack", + "baltoy": "Puppance", + "claydol": "Lepumentas", + "lileep": "Liliep", + "cradily": "Wielie", "anorith": "Anorith", "armaldo": "Armaldo", - "feebas": "Feebas", + "feebas": "Barschwa", "milotic": "Milotic", - "castform": "Castform", + "castform": "Formeo", "kecleon": "Kecleon", "shuppet": "Shuppet", "banette": "Banette", - "duskull": "Duskull", - "dusclops": "Dusclops", + "duskull": "Zwirrlicht", + "dusclops": "Zwirrklop", "tropius": "Tropius", - "chimecho": "Chimecho", + "chimecho": "Palimpalim", "absol": "Absol", - "wynaut": "Wynaut", - "snorunt": "Snorunt", - "glalie": "Glalie", - "spheal": "Spheal", - "sealeo": "Sealeo", - "walrein": "Walrein", - "clamperl": "Clamperl", - "huntail": "Huntail", - "gorebyss": "Gorebyss", + "wynaut": "Isso", + "snorunt": "Schneppke", + "glalie": "Firnontor", + "spheal": "Seemops", + "sealeo": "Seejong", + "walrein": "Walraisa", + "clamperl": "Perlu", + "huntail": "Aalabyss", + "gorebyss": "Saganabyss", "relicanth": "Relicanth", - "luvdisc": "Luvdisc", - "bagon": "Bagon", - "shelgon": "Shelgon", - "salamence": "Salamence", - "beldum": "Beldum", + "luvdisc": "Liebiskus", + "bagon": "Kindwurm", + "shelgon": "Draschel", + "salamence": "Brutalanda", + "beldum": "Tanhel", "metang": "Metang", "metagross": "Metagross", "regirock": "Regirock", diff --git a/src/locales/fr/move.ts b/src/locales/fr/move.ts index ba3d1e2badc..b6d17252b59 100644 --- a/src/locales/fr/move.ts +++ b/src/locales/fr/move.ts @@ -390,7 +390,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur se relaxe et allège son corps pour beaucoup augmenter sa Vitesse." }, "quickAttack": { - name: "Vive-attaque", + name: "Vive-Attaque", effect: "Le lanceur fonce sur la cible si rapidement qu’on parvient à peine à le discerner. Frappe en priorité." }, "rage": { @@ -1090,7 +1090,7 @@ export const move: MoveTranslationEntries = { effect: "Imite la cible et copie son talent." }, "wish": { - name: "Voeu", + name: "Vœu", effect: "Un vœu qui permet au lanceur ou au Pokémon entrant sur le terrain au tour suivant de récupérer la moitié des PV max du lanceur." }, "assist": { @@ -1410,7 +1410,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur projette une aura aquatique sur la cible, et peut la rendre confuse." }, "doomDesire": { - name: "Voeu Destructeur", + name: "Vœu Destructeur", effect: "Le lanceur génère une sphère lumineuse qu’il projette sur l’ennemi deux tours plus tard." }, "psychoBoost": { @@ -1442,7 +1442,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur effectue une rotation rapide et frappe la cible. Plus la Vitesse du lanceur est basse par rapport à celle de la cible, plus il inflige de dégâts." }, "healingWish": { - name: "Voeu Soin", + name: "Vœu Soin", effect: "Le lanceur tombe K.O. pour soigner les altérations de statut et les PV du Pokémon qui viendra le remplacer sur le terrain." }, "brine": { @@ -1786,7 +1786,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur fait flotter des pierres autour de la cible qui blessent tout adversaire entrant au combat." }, "grassKnot": { - name: "Noeud Herbe", + name: "Nœud Herbe", effect: "Le lanceur fait des nœuds dans l’herbe pour faire trébucher la cible. Plus la cible est lourde, plus la puissance de cette capacité augmente." }, "chatter": { @@ -2030,7 +2030,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur emmène l’ennemi dans les airs au premier tour et le lâche dans le vide au second. L’ennemi saisi ne peut pas attaquer." }, "shiftGear": { - name: "Chgt Vitesse", + name: "Change-Vitesse", effect: "Le lanceur fait tourner ses engrenages. Cela augmente son Attaque et augmente beaucoup sa Vitesse." }, "circleThrow": { @@ -2858,7 +2858,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur attaque avec un rayon de lumière mystérieux. Ignore le talent de la cible." }, "tearfulLook": { - name: "Larme à l’Oeil", + name: "Larme à l’Œil", effect: "Le lanceur regarde la cible avec des yeux remplis de larmes. Celle-ci perd toute combativité et voit son Attaque et son Attaque Spéciale baisser." }, "zingZap": { @@ -3362,7 +3362,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur entaille la cible avec ses ailes renforcées par une émanation psychique. Taux de critiques élevé. Cela augmente la Vitesse du lanceur." }, "bitterMalice": { - name: "Coeur de Rancoeur", + name: "Cœur de Rancœur", effect: "Une rancœur glaciale frappe la cible et baisse son Attaque." }, "shelter": { diff --git a/src/phases.ts b/src/phases.ts index 640f475927e..fdca671dbff 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1697,7 +1697,7 @@ export class CommandPhase extends FieldPhase { } break; case Command.BALL: - if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1)) { + if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) { this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex); this.scene.ui.setMode(Mode.MESSAGE); this.scene.ui.showText(i18next.t('menu:noPokeballForce'), null, () => { diff --git a/tsconfig.json b/tsconfig.json index c07d12b010c..ab6fd748bfc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,7 @@ "resolveJsonModule": true, "esModuleInterop": true, "strictNullChecks": false, - "sourceMap": true, + "sourceMap": false, "strict": false, "rootDir": "./src", "baseUrl": "./src", diff --git a/vite.config.js b/vite.config.js index f257239cafa..220747b98e3 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,7 +8,7 @@ export default defineConfig(({ mode }) => { clearScreen: false, build: { minify: 'esbuild', - sourcemap: true + sourcemap: false }, esbuild: { pure: mode === 'production' ? [ 'console.log' ] : [],