diff --git a/.gitignore b/.gitignore index 4cf3196a72b..55f9203a81d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,6 @@ public/images/pokemon/icons/input/output/* public/images/character/*/ src/data/battle-anim-raw-data*.ts src/data/battle-anim-data.ts +src/overrides.ts coverage \ No newline at end of file diff --git a/public/images/pokemon_icons_6.json b/public/images/pokemon_icons_6.json index 48a676cc9ca..f0d7a46c7d4 100644 --- a/public/images/pokemon_icons_6.json +++ b/public/images/pokemon_icons_6.json @@ -5,7 +5,7 @@ "format": "RGBA8888", "size": { "w": 254, - "h": 554 + "h": 557 }, "scale": 1, "frames": [ @@ -556,7 +556,7 @@ } }, { - "filename": "708", + "filename": "675", "rotated": false, "trimmed": true, "sourceSize": { @@ -564,16 +564,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 25, - "h": 21 + "x": 7, + "y": 4, + "w": 28, + "h": 24 }, "frame": { "x": 0, "y": 533, - "w": 25, - "h": 21 + "w": 28, + "h": 24 + } + }, + { + "filename": "675s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 28, + "h": 24 + }, + "frame": { + "x": 28, + "y": 533, + "w": 28, + "h": 24 } }, { @@ -597,27 +618,6 @@ "h": 27 } }, - { - "filename": "708s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 25, - "y": 533, - "w": 25, - "h": 21 - } - }, { "filename": "691", "rotated": false, @@ -661,7 +661,7 @@ } }, { - "filename": "675", + "filename": "715", "rotated": false, "trimmed": true, "sourceSize": { @@ -669,7 +669,7 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 6, "y": 4, "w": 28, "h": 24 @@ -786,6 +786,27 @@ "h": 22 } }, + { + "filename": "658-ash", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 30, + "h": 23 + }, + "frame": { + "x": 132, + "y": 49, + "w": 30, + "h": 23 + } + }, { "filename": "658", "rotated": false, @@ -801,8 +822,8 @@ "h": 22 }, "frame": { - "x": 132, - "y": 49, + "x": 162, + "y": 50, "w": 30, "h": 22 } @@ -822,7 +843,7 @@ "h": 23 }, "frame": { - "x": 162, + "x": 192, "y": 50, "w": 30, "h": 23 @@ -843,8 +864,8 @@ "h": 22 }, "frame": { - "x": 192, - "y": 50, + "x": 222, + "y": 51, "w": 30, "h": 22 } @@ -864,51 +885,9 @@ "h": 22 }, "frame": { - "x": 222, - "y": 51, - "w": 30, - "h": 22 - } - }, - { - "filename": "654", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 22 - }, - "frame": { - "x": 50, + "x": 38, "y": 54, - "w": 20, - "h": 22 - } - }, - { - "filename": "705", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 6, - "w": 15, - "h": 22 - }, - "frame": { - "x": 35, - "y": 56, - "w": 15, + "w": 30, "h": 22 } }, @@ -927,119 +906,14 @@ "h": 22 }, "frame": { - "x": 70, - "y": 70, + "x": 35, + "y": 76, "w": 30, "h": 22 } }, { - "filename": "675s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 100, - "y": 70, - "w": 28, - "h": 24 - } - }, - { - "filename": "715", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 128, - "y": 71, - "w": 28, - "h": 24 - } - }, - { - "filename": "715s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 28, - "h": 24 - }, - "frame": { - "x": 156, - "y": 73, - "w": 28, - "h": 24 - } - }, - { - "filename": "654s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 22 - }, - "frame": { - "x": 50, - "y": 76, - "w": 20, - "h": 22 - } - }, - { - "filename": "705s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 6, - "w": 15, - "h": 22 - }, - "frame": { - "x": 35, - "y": 78, - "w": 15, - "h": 22 - } - }, - { - "filename": "676-diamond", + "filename": "671-orange", "rotated": false, "trimmed": true, "sourceSize": { @@ -1048,15 +922,15 @@ }, "spriteSourceSize": { "x": 8, - "y": 0, - "w": 24, - "h": 28 + "y": 3, + "w": 26, + "h": 27 }, "frame": { "x": 32, - "y": 100, - "w": 24, - "h": 28 + "y": 98, + "w": 26, + "h": 27 } }, { @@ -1075,32 +949,11 @@ }, "frame": { "x": 32, - "y": 128, + "y": 125, "w": 26, "h": 24 } }, - { - "filename": "671-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 27 - }, - "frame": { - "x": 29, - "y": 152, - "w": 26, - "h": 27 - } - }, { "filename": "671-red", "rotated": false, @@ -1117,7 +970,7 @@ }, "frame": { "x": 29, - "y": 179, + "y": 149, "w": 26, "h": 27 } @@ -1137,12 +990,54 @@ "h": 27 }, "frame": { - "x": 28, - "y": 206, + "x": 29, + "y": 176, "w": 26, "h": 27 } }, + { + "filename": "676-diamond", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 24, + "h": 28 + }, + "frame": { + "x": 58, + "y": 98, + "w": 24, + "h": 28 + } + }, + { + "filename": "652s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 26, + "h": 24 + }, + "frame": { + "x": 58, + "y": 126, + "w": 26, + "h": 24 + } + }, { "filename": "671-yellow", "rotated": false, @@ -1158,8 +1053,8 @@ "h": 27 }, "frame": { - "x": 28, - "y": 233, + "x": 55, + "y": 150, "w": 26, "h": 27 } @@ -1179,12 +1074,33 @@ "h": 27 }, "frame": { - "x": 28, - "y": 260, + "x": 55, + "y": 177, "w": 26, "h": 27 } }, + { + "filename": "650", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 65, + "y": 76, + "w": 17, + "h": 22 + } + }, { "filename": "671s-orange", "rotated": false, @@ -1200,8 +1116,29 @@ "h": 27 }, "frame": { - "x": 28, - "y": 287, + "x": 82, + "y": 70, + "w": 26, + "h": 27 + } + }, + { + "filename": "671s-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 26, + "h": 27 + }, + "frame": { + "x": 82, + "y": 97, "w": 26, "h": 27 } @@ -1221,33 +1158,12 @@ "h": 28 }, "frame": { - "x": 56, - "y": 98, + "x": 108, + "y": 70, "w": 24, "h": 28 } }, - { - "filename": "671s-red", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 26, - "h": 27 - }, - "frame": { - "x": 58, - "y": 126, - "w": 26, - "h": 27 - } - }, { "filename": "671s-white", "rotated": false, @@ -1263,8 +1179,8 @@ "h": 27 }, "frame": { - "x": 55, - "y": 153, + "x": 132, + "y": 72, "w": 26, "h": 27 } @@ -1284,12 +1200,54 @@ "h": 27 }, "frame": { - "x": 55, - "y": 180, + "x": 158, + "y": 72, "w": 26, "h": 27 } }, + { + "filename": "676-dandy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 108, + "y": 98, + "w": 24, + "h": 26 + } + }, + { + "filename": "715s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 4, + "w": 28, + "h": 24 + }, + "frame": { + "x": 132, + "y": 99, + "w": 28, + "h": 24 + } + }, { "filename": "676-star", "rotated": false, @@ -1305,8 +1263,8 @@ "h": 27 }, "frame": { - "x": 54, - "y": 207, + "x": 84, + "y": 124, "w": 26, "h": 27 } @@ -1326,12 +1284,54 @@ "h": 27 }, "frame": { - "x": 54, - "y": 234, + "x": 81, + "y": 151, "w": 26, "h": 27 } }, + { + "filename": "660", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 26, + "h": 25 + }, + "frame": { + "x": 81, + "y": 178, + "w": 26, + "h": 25 + } + }, + { + "filename": "676", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 110, + "y": 124, + "w": 24, + "h": 27 + } + }, { "filename": "721", "rotated": false, @@ -1347,138 +1347,12 @@ "h": 27 }, "frame": { - "x": 54, - "y": 261, + "x": 107, + "y": 151, "w": 25, "h": 27 } }, - { - "filename": "676-heart", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 54, - "y": 288, - "w": 25, - "h": 26 - } - }, - { - "filename": "685", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 80, - "y": 92, - "w": 20, - "h": 23 - } - }, - { - "filename": "655", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 23 - }, - "frame": { - "x": 100, - "y": 94, - "w": 27, - "h": 23 - } - }, - { - "filename": "655s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 27, - "h": 23 - }, - "frame": { - "x": 127, - "y": 95, - "w": 27, - "h": 23 - } - }, - { - "filename": "707s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 27, - "h": 24 - }, - "frame": { - "x": 154, - "y": 97, - "w": 27, - "h": 24 - } - }, - { - "filename": "713", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 27, - "h": 24 - }, - "frame": { - "x": 28, - "y": 314, - "w": 27, - "h": 24 - } - }, { "filename": "721s", "rotated": false, @@ -1494,243 +1368,12 @@ "h": 27 }, "frame": { - "x": 27, - "y": 338, + "x": 134, + "y": 123, "w": 25, "h": 27 } }, - { - "filename": "652s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 26, - "h": 24 - }, - "frame": { - "x": 55, - "y": 314, - "w": 26, - "h": 24 - } - }, - { - "filename": "660", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 26, - "h": 25 - }, - "frame": { - "x": 52, - "y": 338, - "w": 26, - "h": 25 - } - }, - { - "filename": "684", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 12, - "w": 17, - "h": 16 - }, - "frame": { - "x": 27, - "y": 365, - "w": 17, - "h": 16 - } - }, - { - "filename": "676", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 30, - "y": 381, - "w": 24, - "h": 27 - } - }, - { - "filename": "676s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 30, - "y": 408, - "w": 24, - "h": 27 - } - }, - { - "filename": "699", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 30, - "y": 435, - "w": 24, - "h": 27 - } - }, - { - "filename": "699s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 24, - "h": 27 - }, - "frame": { - "x": 30, - "y": 462, - "w": 24, - "h": 27 - } - }, - { - "filename": "676-dandy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 30, - "y": 489, - "w": 24, - "h": 26 - } - }, - { - "filename": "672", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 17, - "h": 18 - }, - "frame": { - "x": 30, - "y": 515, - "w": 17, - "h": 18 - } - }, - { - "filename": "682", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 15, - "h": 16 - }, - "frame": { - "x": 44, - "y": 365, - "w": 15, - "h": 16 - } - }, - { - "filename": "651", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 59, - "y": 363, - "w": 21, - "h": 22 - } - }, { "filename": "660s", "rotated": false, @@ -1746,8 +1389,8 @@ "h": 25 }, "frame": { - "x": 54, - "y": 385, + "x": 107, + "y": 178, "w": 26, "h": 25 } @@ -1767,8 +1410,8 @@ "h": 25 }, "frame": { - "x": 54, - "y": 410, + "x": 160, + "y": 99, "w": 26, "h": 25 } @@ -1788,12 +1431,33 @@ "h": 25 }, "frame": { - "x": 54, - "y": 435, + "x": 159, + "y": 124, "w": 26, "h": 25 } }, + { + "filename": "676-heart", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 184, + "y": 73, + "w": 25, + "h": 26 + } + }, { "filename": "666-elegant", "rotated": false, @@ -1809,12 +1473,33 @@ "h": 25 }, "frame": { - "x": 54, - "y": 460, + "x": 209, + "y": 73, "w": 26, "h": 25 } }, + { + "filename": "683", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 19, + "h": 23 + }, + "frame": { + "x": 235, + "y": 73, + "w": 19, + "h": 23 + } + }, { "filename": "666-fancy", "rotated": false, @@ -1830,14 +1515,14 @@ "h": 25 }, "frame": { - "x": 54, - "y": 485, + "x": 186, + "y": 99, "w": 26, "h": 25 } }, { - "filename": "659", + "filename": "666-garden", "rotated": false, "trimmed": true, "sourceSize": { @@ -1845,20 +1530,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 16, + "x": 8, + "y": 2, + "w": 26, "h": 25 }, "frame": { - "x": 184, - "y": 73, - "w": 16, + "x": 185, + "y": 124, + "w": 26, "h": 25 } }, { - "filename": "695", + "filename": "676-pharaoh", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 212, + "y": 98, + "w": 24, + "h": 26 + } + }, + { + "filename": "679", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 236, + "y": 96, + "w": 18, + "h": 24 + } + }, + { + "filename": "666-high-plains", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 211, + "y": 124, + "w": 26, + "h": 25 + } + }, + { + "filename": "698", "rotated": false, "trimmed": true, "sourceSize": { @@ -1868,13 +1616,1063 @@ "spriteSourceSize": { "x": 11, "y": 4, - "w": 22, + "w": 17, "h": 24 }, "frame": { - "x": 200, - "y": 72, - "w": 22, + "x": 237, + "y": 120, + "w": 17, + "h": 24 + } + }, + { + "filename": "698s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 237, + "y": 144, + "w": 17, + "h": 24 + } + }, + { + "filename": "676s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 132, + "y": 151, + "w": 24, + "h": 27 + } + }, + { + "filename": "666-icy-snow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 133, + "y": 178, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-jungle", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 29, + "y": 203, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-marine", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 28, + "y": 228, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-meadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 28, + "y": 253, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-modern", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 28, + "y": 278, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-monsoon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 55, + "y": 204, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-ocean", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 81, + "y": 203, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-poke-ball", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 107, + "y": 203, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-polar", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 133, + "y": 203, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-river", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 54, + "y": 229, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sandstorm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 54, + "y": 254, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-savanna", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 54, + "y": 279, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-sun", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 28, + "y": 303, + "w": 26, + "h": 25 + } + }, + { + "filename": "666-tundra", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 27, + "y": 328, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-archipelago", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 27, + "y": 353, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-continental", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 54, + "y": 304, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-elegant", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 53, + "y": 329, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-fancy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 53, + "y": 354, + "w": 26, + "h": 25 + } + }, + { + "filename": "711-large", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 25 + }, + "frame": { + "x": 30, + "y": 378, + "w": 23, + "h": 25 + } + }, + { + "filename": "666s-garden", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 53, + "y": 379, + "w": 26, + "h": 25 + } + }, + { + "filename": "711-super", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 30, + "y": 403, + "w": 23, + "h": 25 + } + }, + { + "filename": "666s-high-plains", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 53, + "y": 404, + "w": 26, + "h": 25 + } + }, + { + "filename": "711s-large", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 25 + }, + "frame": { + "x": 30, + "y": 428, + "w": 23, + "h": 25 + } + }, + { + "filename": "666s-icy-snow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 53, + "y": 429, + "w": 26, + "h": 25 + } + }, + { + "filename": "711s-super", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 30, + "y": 453, + "w": 23, + "h": 25 + } + }, + { + "filename": "666s-jungle", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 53, + "y": 454, + "w": 26, + "h": 25 + } + }, + { + "filename": "657", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 22 + }, + "frame": { + "x": 30, + "y": 478, + "w": 23, + "h": 22 + } + }, + { + "filename": "699", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 30, + "y": 500, + "w": 24, + "h": 27 + } + }, + { + "filename": "708", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 53, + "y": 479, + "w": 25, + "h": 21 + } + }, + { + "filename": "699s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, + "frame": { + "x": 54, + "y": 500, + "w": 24, + "h": 27 + } + }, + { + "filename": "676s-dandy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 56, + "y": 527, + "w": 24, + "h": 26 + } + }, + { + "filename": "655", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 159, + "y": 149, + "w": 27, + "h": 23 + } + }, + { + "filename": "655s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 27, + "h": 23 + }, + "frame": { + "x": 186, + "y": 149, + "w": 27, + "h": 23 + } + }, + { + "filename": "676-matron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 213, + "y": 149, + "w": 24, + "h": 25 + } + }, + { + "filename": "650s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 237, + "y": 168, + "w": 17, + "h": 22 + } + }, + { + "filename": "666s-marine", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 159, + "y": 172, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-meadow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 185, + "y": 172, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-modern", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 211, + "y": 174, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-monsoon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 159, + "y": 197, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-ocean", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 185, + "y": 197, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-poke-ball", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 211, + "y": 199, + "w": 26, + "h": 25 + } + }, + { + "filename": "710-large", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 237, + "y": 190, + "w": 17, + "h": 20 + } + }, + { + "filename": "710s-large", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 237, + "y": 210, + "w": 17, + "h": 20 + } + }, + { + "filename": "707s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 27, + "h": 24 + }, + "frame": { + "x": 159, + "y": 222, + "w": 27, + "h": 24 + } + }, + { + "filename": "676-debutante", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 186, + "y": 222, + "w": 25, + "h": 25 + } + }, + { + "filename": "666s-polar", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 211, + "y": 224, + "w": 26, + "h": 25 + } + }, + { + "filename": "653", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 237, + "y": 230, + "w": 17, + "h": 19 + } + }, + { + "filename": "713", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 27, + "h": 24 + }, + "frame": { + "x": 81, + "y": 228, + "w": 27, "h": 24 } }, @@ -1893,14 +2691,35 @@ "h": 24 }, "frame": { - "x": 222, - "y": 73, + "x": 108, + "y": 228, "w": 27, "h": 24 } }, { - "filename": "666-garden", + "filename": "676s-matron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 135, + "y": 228, + "w": 24, + "h": 25 + } + }, + { + "filename": "666s-river", "rotated": false, "trimmed": true, "sourceSize": { @@ -1914,14 +2733,14 @@ "h": 25 }, "frame": { - "x": 181, - "y": 98, + "x": 80, + "y": 252, "w": 26, "h": 25 } }, { - "filename": "666-high-plains", + "filename": "666s-sandstorm", "rotated": false, "trimmed": true, "sourceSize": { @@ -1935,12 +2754,264 @@ "h": 25 }, "frame": { - "x": 207, - "y": 97, + "x": 80, + "y": 277, "w": 26, "h": 25 } }, + { + "filename": "666s-savanna", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 106, + "y": 252, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-sun", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 80, + "y": 302, + "w": 26, + "h": 25 + } + }, + { + "filename": "666s-tundra", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 26, + "h": 25 + }, + "frame": { + "x": 106, + "y": 277, + "w": 26, + "h": 25 + } + }, + { + "filename": "676-kabuki", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 106, + "y": 302, + "w": 25, + "h": 25 + } + }, + { + "filename": "676s-heart", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 26 + }, + "frame": { + "x": 132, + "y": 253, + "w": 25, + "h": 26 + } + }, + { + "filename": "676-la-reine", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 132, + "y": 279, + "w": 25, + "h": 25 + } + }, + { + "filename": "676s-debutante", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 131, + "y": 304, + "w": 25, + "h": 25 + } + }, + { + "filename": "676s-kabuki", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 159, + "y": 246, + "w": 25, + "h": 25 + } + }, + { + "filename": "676s-la-reine", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 157, + "y": 271, + "w": 25, + "h": 25 + } + }, + { + "filename": "709", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 184, + "y": 247, + "w": 25, + "h": 25 + } + }, + { + "filename": "709s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 25, + "h": 25 + }, + "frame": { + "x": 182, + "y": 272, + "w": 25, + "h": 25 + } + }, + { + "filename": "676s-pharaoh", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 24, + "h": 26 + }, + "frame": { + "x": 209, + "y": 249, + "w": 24, + "h": 26 + } + }, { "filename": "711", "rotated": false, @@ -1957,7 +3028,7 @@ }, "frame": { "x": 233, - "y": 97, + "y": 249, "w": 21, "h": 23 } @@ -1978,977 +3049,11 @@ }, "frame": { "x": 233, - "y": 120, + "y": 272, "w": 21, "h": 23 } }, - { - "filename": "666-icy-snow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 207, - "y": 122, - "w": 26, - "h": 25 - } - }, - { - "filename": "651s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 233, - "y": 143, - "w": 21, - "h": 22 - } - }, - { - "filename": "659s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 16, - "h": 25 - }, - "frame": { - "x": 84, - "y": 115, - "w": 16, - "h": 25 - } - }, - { - "filename": "666-jungle", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 100, - "y": 117, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-marine", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 126, - "y": 118, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-meadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 152, - "y": 121, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-modern", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 178, - "y": 123, - "w": 26, - "h": 25 - } - }, - { - "filename": "665", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 84, - "y": 140, - "w": 16, - "h": 17 - } - }, - { - "filename": "666-monsoon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 100, - "y": 142, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-ocean", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 126, - "y": 143, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-poke-ball", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 152, - "y": 146, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-polar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 178, - "y": 148, - "w": 26, - "h": 25 - } - }, - { - "filename": "683", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 19, - "h": 23 - }, - "frame": { - "x": 81, - "y": 157, - "w": 19, - "h": 23 - } - }, - { - "filename": "666-river", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 204, - "y": 147, - "w": 26, - "h": 25 - } - }, - { - "filename": "676-pharaoh", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 230, - "y": 165, - "w": 24, - "h": 26 - } - }, - { - "filename": "666-sandstorm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 204, - "y": 172, - "w": 26, - "h": 25 - } - }, - { - "filename": "676s-dandy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 230, - "y": 191, - "w": 24, - "h": 26 - } - }, - { - "filename": "676s-heart", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 26 - }, - "frame": { - "x": 81, - "y": 180, - "w": 25, - "h": 26 - } - }, - { - "filename": "703", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 15, - "w": 14, - "h": 13 - }, - "frame": { - "x": 100, - "y": 167, - "w": 14, - "h": 13 - } - }, - { - "filename": "676s-pharaoh", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 24, - "h": 26 - }, - "frame": { - "x": 106, - "y": 180, - "w": 24, - "h": 26 - } - }, - { - "filename": "695s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 22, - "h": 24 - }, - "frame": { - "x": 130, - "y": 168, - "w": 22, - "h": 24 - } - }, - { - "filename": "666-savanna", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 152, - "y": 171, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-sun", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 178, - "y": 173, - "w": 26, - "h": 25 - } - }, - { - "filename": "666-tundra", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 204, - "y": 197, - "w": 26, - "h": 25 - } - }, - { - "filename": "676-matron", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 25 - }, - "frame": { - "x": 230, - "y": 217, - "w": 24, - "h": 25 - } - }, - { - "filename": "662", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 130, - "y": 192, - "w": 22, - "h": 20 - } - }, - { - "filename": "666s-archipelago", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 152, - "y": 196, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-continental", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 178, - "y": 198, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-elegant", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 204, - "y": 222, - "w": 26, - "h": 25 - } - }, - { - "filename": "676s-matron", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 25 - }, - "frame": { - "x": 230, - "y": 242, - "w": 24, - "h": 25 - } - }, - { - "filename": "666s-fancy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 54, - "y": 510, - "w": 26, - "h": 25 - } - }, - { - "filename": "701", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 50, - "y": 535, - "w": 23, - "h": 19 - } - }, - { - "filename": "701s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 9, - "w": 23, - "h": 19 - }, - "frame": { - "x": 73, - "y": 535, - "w": 23, - "h": 19 - } - }, - { - "filename": "666s-garden", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 78, - "y": 338, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-high-plains", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 363, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-icy-snow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 388, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-jungle", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 413, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-marine", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 438, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-meadow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 463, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-modern", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 488, - "w": 26, - "h": 25 - } - }, - { - "filename": "657", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 22 - }, - "frame": { - "x": 80, - "y": 513, - "w": 23, - "h": 22 - } - }, - { - "filename": "720", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 19 - }, - "frame": { - "x": 96, - "y": 535, - "w": 21, - "h": 19 - } - }, - { - "filename": "650", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 103, - "y": 513, - "w": 17, - "h": 22 - } - }, - { - "filename": "720s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 19 - }, - "frame": { - "x": 117, - "y": 535, - "w": 21, - "h": 19 - } - }, - { - "filename": "666s-monsoon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 104, - "y": 206, - "w": 26, - "h": 25 - } - }, - { - "filename": "662s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 22, - "h": 20 - }, - "frame": { - "x": 130, - "y": 212, - "w": 22, - "h": 20 - } - }, { "filename": "687", "rotated": false, @@ -2964,14 +3069,14 @@ "h": 25 }, "frame": { - "x": 80, - "y": 207, + "x": 207, + "y": 275, "w": 24, "h": 25 } }, { - "filename": "666s-ocean", + "filename": "657s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2979,16 +3084,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 + "x": 10, + "y": 8, + "w": 23, + "h": 22 }, "frame": { - "x": 80, - "y": 232, - "w": 26, - "h": 25 + "x": 231, + "y": 295, + "w": 23, + "h": 22 + } + }, + { + "filename": "708s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 157, + "y": 296, + "w": 25, + "h": 21 } }, { @@ -3006,96 +3132,12 @@ "h": 25 }, "frame": { - "x": 106, - "y": 231, + "x": 182, + "y": 297, "w": 24, "h": 25 } }, - { - "filename": "666s-poke-ball", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 130, - "y": 232, - "w": 26, - "h": 25 - } - }, - { - "filename": "700", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 156, - "y": 221, - "w": 22, - "h": 23 - } - }, - { - "filename": "666s-polar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 178, - "y": 223, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-river", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 204, - "y": 247, - "w": 26, - "h": 25 - } - }, { "filename": "706", "rotated": false, @@ -3111,75 +3153,12 @@ "h": 24 }, "frame": { - "x": 230, - "y": 267, + "x": 206, + "y": 300, "w": 24, "h": 24 } }, - { - "filename": "700s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 156, - "y": 244, - "w": 22, - "h": 23 - } - }, - { - "filename": "666s-sandstorm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 178, - "y": 248, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-savanna", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 204, - "y": 272, - "w": 26, - "h": 25 - } - }, { "filename": "706s", "rotated": false, @@ -3196,116 +3175,11 @@ }, "frame": { "x": 230, - "y": 291, + "y": 317, "w": 24, "h": 24 } }, - { - "filename": "685s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 20, - "h": 23 - }, - "frame": { - "x": 81, - "y": 315, - "w": 20, - "h": 23 - } - }, - { - "filename": "666s-sun", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 80, - "y": 257, - "w": 26, - "h": 25 - } - }, - { - "filename": "666s-tundra", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 26, - "h": 25 - }, - "frame": { - "x": 79, - "y": 282, - "w": 26, - "h": 25 - } - }, - { - "filename": "711-large", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 106, - "y": 256, - "w": 23, - "h": 25 - } - }, - { - "filename": "676-debutante", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 129, - "y": 257, - "w": 25, - "h": 25 - } - }, { "filename": "692", "rotated": false, @@ -3321,14 +3195,14 @@ "h": 17 }, "frame": { - "x": 154, - "y": 267, + "x": 156, + "y": 317, "w": 24, "h": 17 } }, { - "filename": "676-kabuki", + "filename": "692s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3337,246 +3211,15 @@ }, "spriteSourceSize": { "x": 8, - "y": 3, - "w": 25, - "h": 25 + "y": 11, + "w": 24, + "h": 17 }, "frame": { - "x": 178, - "y": 273, - "w": 25, - "h": 25 - } - }, - { - "filename": "676-la-reine", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 105, - "y": 282, - "w": 25, - "h": 25 - } - }, - { - "filename": "711-super", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 130, - "y": 282, - "w": 23, - "h": 25 - } - }, - { - "filename": "676s-debutante", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 153, - "y": 284, - "w": 25, - "h": 25 - } - }, - { - "filename": "676s-kabuki", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 101, - "y": 307, - "w": 25, - "h": 25 - } - }, - { - "filename": "676s-la-reine", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 126, - "y": 307, - "w": 25, - "h": 25 - } - }, - { - "filename": "709", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 151, - "y": 309, - "w": 25, - "h": 25 - } - }, - { - "filename": "709s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 25, - "h": 25 - }, - "frame": { - "x": 104, - "y": 332, - "w": 25, - "h": 25 - } - }, - { - "filename": "678-female", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 21, - "h": 22 - }, - "frame": { - "x": 129, - "y": 332, - "w": 21, - "h": 22 - } - }, - { - "filename": "657s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 22 - }, - "frame": { - "x": 150, - "y": 334, - "w": 23, - "h": 22 - } - }, - { - "filename": "711s-large", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 25 - }, - "frame": { - "x": 106, - "y": 357, - "w": 23, - "h": 25 - } - }, - { - "filename": "711s-super", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 106, - "y": 382, - "w": 23, - "h": 25 + "x": 180, + "y": 322, + "w": 24, + "h": 17 } }, { @@ -3594,12 +3237,75 @@ "h": 22 }, "frame": { - "x": 106, - "y": 407, + "x": 204, + "y": 324, "w": 23, "h": 22 } }, + { + "filename": "659", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 16, + "h": 25 + }, + "frame": { + "x": 78, + "y": 479, + "w": 16, + "h": 25 + } + }, + { + "filename": "683s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 19, + "h": 23 + }, + "frame": { + "x": 78, + "y": 504, + "w": 19, + "h": 23 + } + }, + { + "filename": "659s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 16, + "h": 25 + }, + "frame": { + "x": 80, + "y": 527, + "w": 16, + "h": 25 + } + }, { "filename": "673s", "rotated": false, @@ -3615,14 +3321,119 @@ "h": 22 }, "frame": { - "x": 106, - "y": 429, + "x": 227, + "y": 341, "w": 23, "h": 22 } }, { - "filename": "678", + "filename": "679s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 79, + "y": 329, + "w": 18, + "h": 24 + } + }, + { + "filename": "695", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 97, + "y": 327, + "w": 22, + "h": 24 + } + }, + { + "filename": "695s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 79, + "y": 353, + "w": 22, + "h": 24 + } + }, + { + "filename": "700", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 79, + "y": 377, + "w": 22, + "h": 23 + } + }, + { + "filename": "700s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 79, + "y": 400, + "w": 22, + "h": 23 + } + }, + { + "filename": "651", "rotated": false, "trimmed": true, "sourceSize": { @@ -3636,56 +3447,14 @@ "h": 22 }, "frame": { - "x": 129, - "y": 354, + "x": 79, + "y": 423, "w": 21, "h": 22 } }, { - "filename": "2670", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 106, - "y": 451, - "w": 23, - "h": 21 - } - }, - { - "filename": "2670s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 106, - "y": 472, - "w": 23, - "h": 21 - } - }, - { - "filename": "667", + "filename": "651s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3694,15 +3463,120 @@ }, "spriteSourceSize": { "x": 10, - "y": 8, + "y": 6, "w": 21, - "h": 20 + "h": 22 }, "frame": { - "x": 106, - "y": 493, + "x": 79, + "y": 445, "w": 21, - "h": 20 + "h": 22 + } + }, + { + "filename": "685", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 101, + "y": 351, + "w": 20, + "h": 23 + } + }, + { + "filename": "685s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 101, + "y": 374, + "w": 20, + "h": 23 + } + }, + { + "filename": "654", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 101, + "y": 397, + "w": 20, + "h": 22 + } + }, + { + "filename": "678-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 119, + "y": 329, + "w": 21, + "h": 22 + } + }, + { + "filename": "688", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 140, + "y": 329, + "w": 16, + "h": 24 } }, { @@ -3720,12 +3594,117 @@ "h": 22 }, "frame": { - "x": 120, - "y": 513, + "x": 121, + "y": 351, "w": 19, "h": 22 } }, + { + "filename": "701", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 156, + "y": 334, + "w": 23, + "h": 19 + } + }, + { + "filename": "2670", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 140, + "y": 353, + "w": 23, + "h": 21 + } + }, + { + "filename": "670-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 121, + "y": 373, + "w": 19, + "h": 22 + } + }, + { + "filename": "2670s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 23, + "h": 21 + }, + "frame": { + "x": 140, + "y": 374, + "w": 23, + "h": 21 + } + }, + { + "filename": "678", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 21, + "h": 22 + }, + "frame": { + "x": 121, + "y": 395, + "w": 21, + "h": 22 + } + }, { "filename": "678s-female", "rotated": false, @@ -3741,12 +3720,33 @@ "h": 22 }, "frame": { - "x": 129, - "y": 376, + "x": 142, + "y": 395, "w": 21, "h": 22 } }, + { + "filename": "688s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 163, + "y": 353, + "w": 16, + "h": 24 + } + }, { "filename": "678s", "rotated": false, @@ -3762,12 +3762,180 @@ "h": 22 }, "frame": { - "x": 150, - "y": 356, + "x": 179, + "y": 339, "w": 21, "h": 22 } }, + { + "filename": "654s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 163, + "y": 377, + "w": 20, + "h": 22 + } + }, + { + "filename": "662", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 163, + "y": 399, + "w": 22, + "h": 20 + } + }, + { + "filename": "684", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 12, + "w": 17, + "h": 16 + }, + "frame": { + "x": 179, + "y": 361, + "w": 17, + "h": 16 + } + }, + { + "filename": "670-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 183, + "y": 377, + "w": 19, + "h": 22 + } + }, + { + "filename": "662s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 22, + "h": 20 + }, + "frame": { + "x": 185, + "y": 399, + "w": 22, + "h": 20 + } + }, + { + "filename": "696", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 207, + "y": 346, + "w": 20, + "h": 17 + } + }, + { + "filename": "701s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 9, + "w": 23, + "h": 19 + }, + "frame": { + "x": 121, + "y": 417, + "w": 23, + "h": 19 + } + }, + { + "filename": "696s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 20, + "h": 17 + }, + "frame": { + "x": 101, + "y": 419, + "w": 20, + "h": 17 + } + }, { "filename": "719", "rotated": false, @@ -3783,8 +3951,8 @@ "h": 22 }, "frame": { - "x": 129, - "y": 398, + "x": 100, + "y": 436, "w": 21, "h": 22 } @@ -3804,14 +3972,14 @@ "h": 22 }, "frame": { - "x": 150, - "y": 378, + "x": 121, + "y": 436, "w": 21, "h": 22 } }, { - "filename": "679", + "filename": "670-white", "rotated": false, "trimmed": true, "sourceSize": { @@ -3819,20 +3987,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 18, - "h": 24 + "x": 10, + "y": 6, + "w": 19, + "h": 22 }, "frame": { - "x": 129, - "y": 420, - "w": 18, - "h": 24 + "x": 144, + "y": 417, + "w": 19, + "h": 22 } }, { - "filename": "679s", + "filename": "667", "rotated": false, "trimmed": true, "sourceSize": { @@ -3840,16 +4008,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 18, - "h": 24 + "x": 10, + "y": 8, + "w": 21, + "h": 20 }, "frame": { - "x": 129, - "y": 444, - "w": 18, - "h": 24 + "x": 163, + "y": 419, + "w": 21, + "h": 20 } }, { @@ -3867,117 +4035,12 @@ "h": 20 }, "frame": { - "x": 150, - "y": 400, + "x": 184, + "y": 419, "w": 21, "h": 20 } }, - { - "filename": "683s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 19, - "h": 23 - }, - "frame": { - "x": 147, - "y": 420, - "w": 19, - "h": 23 - } - }, - { - "filename": "670-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 147, - "y": 443, - "w": 19, - "h": 22 - } - }, - { - "filename": "698", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 129, - "y": 468, - "w": 17, - "h": 24 - } - }, - { - "filename": "656", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 138, - "y": 535, - "w": 18, - "h": 19 - } - }, - { - "filename": "692s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 24, - "h": 17 - }, - "frame": { - "x": 178, - "y": 298, - "w": 24, - "h": 17 - } - }, { "filename": "714", "rotated": false, @@ -3993,8 +4056,29 @@ "h": 20 }, "frame": { - "x": 176, - "y": 315, + "x": 142, + "y": 439, + "w": 21, + "h": 20 + } + }, + { + "filename": "714s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 6, + "w": 21, + "h": 20 + }, + "frame": { + "x": 163, + "y": 439, "w": 21, "h": 20 } @@ -4014,14 +4098,14 @@ "h": 21 }, "frame": { - "x": 173, - "y": 335, + "x": 184, + "y": 439, "w": 20, "h": 21 } }, { - "filename": "670-red", + "filename": "702", "rotated": false, "trimmed": true, "sourceSize": { @@ -4029,20 +4113,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 + "x": 8, + "y": 11, + "w": 22, + "h": 17 }, "frame": { - "x": 171, - "y": 356, - "w": 19, - "h": 22 + "x": 100, + "y": 458, + "w": 22, + "h": 17 } }, { - "filename": "670-white", + "filename": "710s-super", "rotated": false, "trimmed": true, "sourceSize": { @@ -4051,15 +4135,57 @@ }, "spriteSourceSize": { "x": 10, - "y": 6, - "w": 19, - "h": 22 + "y": 7, + "w": 20, + "h": 21 }, "frame": { - "x": 171, - "y": 378, - "w": 19, - "h": 22 + "x": 122, + "y": 458, + "w": 20, + "h": 21 + } + }, + { + "filename": "720", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 19 + }, + "frame": { + "x": 142, + "y": 459, + "w": 21, + "h": 19 + } + }, + { + "filename": "720s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 19 + }, + "frame": { + "x": 163, + "y": 459, + "w": 21, + "h": 19 } }, { @@ -4077,8 +4203,8 @@ "h": 22 }, "frame": { - "x": 171, - "y": 400, + "x": 184, + "y": 460, "w": 19, "h": 22 } @@ -4098,8 +4224,8 @@ "h": 22 }, "frame": { - "x": 166, - "y": 422, + "x": 94, + "y": 475, "w": 19, "h": 22 } @@ -4119,12 +4245,327 @@ "h": 22 }, "frame": { - "x": 166, - "y": 444, + "x": 97, + "y": 497, "w": 19, "h": 22 } }, + { + "filename": "702s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 11, + "w": 22, + "h": 17 + }, + "frame": { + "x": 113, + "y": 479, + "w": 22, + "h": 17 + } + }, + { + "filename": "670s-red", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 116, + "y": 496, + "w": 19, + "h": 22 + } + }, + { + "filename": "670s-white", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 135, + "y": 479, + "w": 19, + "h": 22 + } + }, + { + "filename": "670s-yellow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 154, + "y": 478, + "w": 19, + "h": 22 + } + }, + { + "filename": "656", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 18, + "h": 19 + }, + "frame": { + "x": 135, + "y": 501, + "w": 18, + "h": 19 + } + }, + { + "filename": "656s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 10, + "w": 18, + "h": 19 + }, + "frame": { + "x": 97, + "y": 519, + "w": 18, + "h": 19 + } + }, + { + "filename": "653s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 96, + "y": 538, + "w": 17, + "h": 19 + } + }, + { + "filename": "710", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 113, + "y": 538, + "w": 17, + "h": 19 + } + }, + { + "filename": "674", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 115, + "y": 519, + "w": 15, + "h": 19 + } + }, + { + "filename": "711-small", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 130, + "y": 520, + "w": 18, + "h": 22 + } + }, + { + "filename": "661", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 18, + "h": 15 + }, + "frame": { + "x": 130, + "y": 542, + "w": 18, + "h": 15 + } + }, + { + "filename": "705", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 6, + "w": 15, + "h": 22 + }, + "frame": { + "x": 148, + "y": 520, + "w": 15, + "h": 22 + } + }, + { + "filename": "661s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 18, + "h": 15 + }, + "frame": { + "x": 148, + "y": 542, + "w": 18, + "h": 15 + } + }, + { + "filename": "674s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 153, + "y": 501, + "w": 15, + "h": 19 + } + }, + { + "filename": "705s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 6, + "w": 15, + "h": 22 + }, + "frame": { + "x": 163, + "y": 520, + "w": 15, + "h": 22 + } + }, { "filename": "686", "rotated": false, @@ -4140,14 +4581,14 @@ "h": 20 }, "frame": { - "x": 127, - "y": 493, + "x": 168, + "y": 500, "w": 18, "h": 20 } }, { - "filename": "650s", + "filename": "672", "rotated": false, "trimmed": true, "sourceSize": { @@ -4155,16 +4596,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 6, + "x": 11, + "y": 10, "w": 17, - "h": 22 + "h": 18 }, "frame": { - "x": 139, - "y": 513, + "x": 173, + "y": 482, "w": 17, - "h": 22 + "h": 18 } }, { @@ -4182,119 +4623,14 @@ "h": 21 }, "frame": { - "x": 145, - "y": 492, + "x": 190, + "y": 482, "w": 14, "h": 21 } }, { - "filename": "688", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 146, - "y": 468, - "w": 16, - "h": 24 - } - }, - { - "filename": "670s-red", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 162, - "y": 466, - "w": 19, - "h": 22 - } - }, - { - "filename": "688s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 185, - "y": 422, - "w": 16, - "h": 24 - } - }, - { - "filename": "670s-white", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 185, - "y": 446, - "w": 19, - "h": 22 - } - }, - { - "filename": "714s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 21, - "h": 20 - }, - "frame": { - "x": 181, - "y": 468, - "w": 21, - "h": 20 - } - }, - { - "filename": "698s", + "filename": "686s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4303,120 +4639,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 156, - "y": 513, - "w": 17, - "h": 24 - } - }, - { - "filename": "702", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 22, - "h": 17 - }, - "frame": { - "x": 156, - "y": 537, - "w": 22, - "h": 17 - } - }, - { - "filename": "664s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 14, - "h": 21 - }, - "frame": { - "x": 159, - "y": 492, - "w": 14, - "h": 21 - } - }, - { - "filename": "670s-yellow", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 173, - "y": 488, - "w": 19, - "h": 22 - } - }, - { - "filename": "710s-super", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 173, - "y": 510, - "w": 20, - "h": 21 - } - }, - { - "filename": "711-small", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, + "y": 8, "w": 18, - "h": 22 + "h": 20 }, "frame": { - "x": 192, - "y": 488, + "x": 186, + "y": 503, "w": 18, - "h": 22 + "h": 20 } }, { @@ -4434,14 +4665,14 @@ "h": 21 }, "frame": { - "x": 193, - "y": 510, + "x": 178, + "y": 523, "w": 18, "h": 21 } }, { - "filename": "696", + "filename": "664s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4449,16 +4680,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, - "h": 17 + "x": 13, + "y": 7, + "w": 14, + "h": 21 }, "frame": { - "x": 210, - "y": 297, - "w": 20, - "h": 17 + "x": 196, + "y": 523, + "w": 14, + "h": 21 + } + }, + { + "filename": "703", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 15, + "w": 14, + "h": 13 + }, + "frame": { + "x": 166, + "y": 544, + "w": 14, + "h": 13 + } + }, + { + "filename": "703s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 15, + "w": 14, + "h": 13 + }, + "frame": { + "x": 180, + "y": 544, + "w": 14, + "h": 13 } }, { @@ -4476,8 +4749,8 @@ "h": 22 }, "frame": { - "x": 178, - "y": 531, + "x": 203, + "y": 460, "w": 18, "h": 22 } @@ -4497,243 +4770,12 @@ "h": 21 }, "frame": { - "x": 196, - "y": 531, + "x": 204, + "y": 439, "w": 18, "h": 21 } }, - { - "filename": "686s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 18, - "h": 20 - }, - "frame": { - "x": 202, - "y": 468, - "w": 18, - "h": 20 - } - }, - { - "filename": "710-large", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 210, - "y": 488, - "w": 17, - "h": 20 - } - }, - { - "filename": "710s-large", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 211, - "y": 508, - "w": 17, - "h": 20 - } - }, - { - "filename": "653", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 214, - "y": 528, - "w": 17, - "h": 19 - } - }, - { - "filename": "653s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 197, - "y": 315, - "w": 17, - "h": 19 - } - }, - { - "filename": "677", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 16, - "h": 18 - }, - "frame": { - "x": 214, - "y": 314, - "w": 16, - "h": 18 - } - }, - { - "filename": "702s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 11, - "w": 22, - "h": 17 - }, - "frame": { - "x": 230, - "y": 315, - "w": 22, - "h": 17 - } - }, - { - "filename": "656s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 10, - "w": 18, - "h": 19 - }, - "frame": { - "x": 193, - "y": 335, - "w": 18, - "h": 19 - } - }, - { - "filename": "674", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 190, - "y": 356, - "w": 15, - "h": 19 - } - }, - { - "filename": "674s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 190, - "y": 375, - "w": 15, - "h": 19 - } - }, - { - "filename": "710", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 190, - "y": 394, - "w": 17, - "h": 19 - } - }, { "filename": "710s", "rotated": false, @@ -4749,8 +4791,8 @@ "h": 19 }, "frame": { - "x": 205, - "y": 354, + "x": 204, + "y": 482, "w": 17, "h": 19 } @@ -4770,8 +4812,8 @@ "h": 18 }, "frame": { - "x": 205, - "y": 373, + "x": 204, + "y": 501, "w": 17, "h": 18 } @@ -4791,14 +4833,14 @@ "h": 18 }, "frame": { - "x": 207, - "y": 391, + "x": 210, + "y": 519, "w": 15, "h": 18 } }, { - "filename": "696s", + "filename": "665", "rotated": false, "trimmed": true, "sourceSize": { @@ -4806,18 +4848,39 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 20, + "x": 12, + "y": 11, + "w": 16, "h": 17 }, "frame": { - "x": 214, - "y": 332, - "w": 20, + "x": 210, + "y": 537, + "w": 16, "h": 17 } }, + { + "filename": "704", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 14, + "w": 12, + "h": 14 + }, + "frame": { + "x": 196, + "y": 363, + "w": 12, + "h": 14 + } + }, { "filename": "694", "rotated": false, @@ -4833,8 +4896,8 @@ "h": 17 }, "frame": { - "x": 234, - "y": 332, + "x": 208, + "y": 363, "w": 18, "h": 17 } @@ -4854,33 +4917,12 @@ "h": 17 }, "frame": { - "x": 222, - "y": 349, + "x": 226, + "y": 363, "w": 18, "h": 17 } }, - { - "filename": "703s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 15, - "w": 14, - "h": 13 - }, - "frame": { - "x": 240, - "y": 349, - "w": 14, - "h": 13 - } - }, { "filename": "712", "rotated": false, @@ -4896,33 +4938,12 @@ "h": 18 }, "frame": { - "x": 222, - "y": 366, + "x": 202, + "y": 380, "w": 17, "h": 18 } }, - { - "filename": "669-orange", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 239, - "y": 366, - "w": 15, - "h": 18 - } - }, { "filename": "712s", "rotated": false, @@ -4938,12 +4959,54 @@ "h": 18 }, "frame": { - "x": 222, - "y": 384, + "x": 219, + "y": 380, "w": 17, "h": 18 } }, + { + "filename": "677", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 16, + "h": 18 + }, + "frame": { + "x": 207, + "y": 398, + "w": 16, + "h": 18 + } + }, + { + "filename": "669-orange", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 223, + "y": 398, + "w": 15, + "h": 18 + } + }, { "filename": "669-red", "rotated": false, @@ -4959,75 +5022,12 @@ "h": 18 }, "frame": { - "x": 239, - "y": 384, + "x": 236, + "y": 380, "w": 15, "h": 18 } }, - { - "filename": "661", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 18, - "h": 15 - }, - "frame": { - "x": 222, - "y": 402, - "w": 18, - "h": 15 - } - }, - { - "filename": "669-white", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 207, - "y": 409, - "w": 15, - "h": 18 - } - }, - { - "filename": "661s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 18, - "h": 15 - }, - "frame": { - "x": 222, - "y": 417, - "w": 18, - "h": 15 - } - }, { "filename": "677s", "rotated": false, @@ -5043,14 +5043,14 @@ "h": 18 }, "frame": { - "x": 201, - "y": 427, + "x": 238, + "y": 398, "w": 16, "h": 18 } }, { - "filename": "669-yellow", + "filename": "669-white", "rotated": false, "trimmed": true, "sourceSize": { @@ -5064,54 +5064,12 @@ "h": 18 }, "frame": { - "x": 204, - "y": 445, + "x": 205, + "y": 419, "w": 15, "h": 18 } }, - { - "filename": "704", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 14, - "w": 12, - "h": 14 - }, - "frame": { - "x": 240, - "y": 402, - "w": 12, - "h": 14 - } - }, - { - "filename": "704s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 14, - "w": 12, - "h": 14 - }, - "frame": { - "x": 240, - "y": 416, - "w": 12, - "h": 14 - } - }, { "filename": "665s", "rotated": false, @@ -5127,8 +5085,8 @@ "h": 17 }, "frame": { - "x": 219, - "y": 432, + "x": 220, + "y": 416, "w": 16, "h": 17 } @@ -5148,12 +5106,33 @@ "h": 16 }, "frame": { - "x": 219, - "y": 449, + "x": 236, + "y": 416, "w": 17, "h": 16 } }, + { + "filename": "669-yellow", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 222, + "y": 433, + "w": 15, + "h": 18 + } + }, { "filename": "669s-blue", "rotated": false, @@ -5169,31 +5148,10 @@ "h": 18 }, "frame": { - "x": 220, - "y": 465, - "w": 15, - "h": 18 - } - }, - { - "filename": "710-small", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 15, - "h": 17 - }, - "frame": { - "x": 235, + "x": 237, "y": 432, "w": 15, - "h": 17 + "h": 18 } }, { @@ -5211,8 +5169,8 @@ "h": 18 }, "frame": { - "x": 236, - "y": 449, + "x": 222, + "y": 451, "w": 15, "h": 18 } @@ -5232,8 +5190,8 @@ "h": 18 }, "frame": { - "x": 235, - "y": 467, + "x": 237, + "y": 450, "w": 15, "h": 18 } @@ -5253,8 +5211,8 @@ "h": 18 }, "frame": { - "x": 227, - "y": 485, + "x": 221, + "y": 469, "w": 15, "h": 18 } @@ -5274,12 +5232,54 @@ "h": 18 }, "frame": { - "x": 228, - "y": 503, + "x": 221, + "y": 487, "w": 15, "h": 18 } }, + { + "filename": "704s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 14, + "w": 12, + "h": 14 + }, + "frame": { + "x": 221, + "y": 505, + "w": 12, + "h": 14 + } + }, + { + "filename": "710-small", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 15, + "h": 17 + }, + "frame": { + "x": 225, + "y": 519, + "w": 15, + "h": 17 + } + }, { "filename": "710s-small", "rotated": false, @@ -5295,12 +5295,33 @@ "h": 17 }, "frame": { - "x": 231, - "y": 521, + "x": 226, + "y": 536, "w": 15, "h": 17 } }, + { + "filename": "682", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 236, + "y": 469, + "w": 15, + "h": 16 + } + }, { "filename": "682s", "rotated": false, @@ -5316,8 +5337,8 @@ "h": 16 }, "frame": { - "x": 231, - "y": 538, + "x": 236, + "y": 485, "w": 15, "h": 16 } @@ -5328,6 +5349,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:049c5b1c50b54f73bca369d3cece4336:2c861a7365c9c9423b050bde6e7e0742:96737d38f2029744a75c1ee001bc1929$" + "smartupdate": "$TexturePacker:SmartUpdate:a80f4550917ab6469d19d3cdd7fc8ebc:a52ccf05d060a2fd0a793e2f02508109:96737d38f2029744a75c1ee001bc1929$" } } diff --git a/public/images/pokemon_icons_6.png b/public/images/pokemon_icons_6.png index 9373aca8b70..46ff8597ce2 100644 Binary files a/public/images/pokemon_icons_6.png and b/public/images/pokemon_icons_6.png differ diff --git a/src/battle-scene.ts b/src/battle-scene.ts index a1bda35142b..21f3f667ae8 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -60,25 +60,10 @@ import { SceneBase } from './scene-base'; import CandyBar from './ui/candy-bar'; import { Variant, variantData } from './data/variant'; import { Localizable } from './plugins/i18n'; +import { STARTING_WAVE_OVERRIDE, OPP_SPECIES_OVERRIDE, SEED_OVERRIDE, STARTING_BIOME_OVERRIDE } from './overrides'; export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1"; -export const SEED_OVERRIDE = ''; -export const STARTER_SPECIES_OVERRIDE = 0; -export const STARTER_FORM_OVERRIDE = 0; -export const STARTING_LEVEL_OVERRIDE = 0; -export const STARTING_WAVE_OVERRIDE = 0; -export const STARTING_BIOME_OVERRIDE = Biome.TOWN; -export const STARTING_MONEY_OVERRIDE = 0; - -export const ABILITY_OVERRIDE = Abilities.NONE; -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; export const startingWave = STARTING_WAVE_OVERRIDE || 1; @@ -1056,6 +1041,8 @@ export default class BattleScene extends SceneBase { case Species.BASCULIN: case Species.DEERLING: case Species.SAWSBUCK: + case Species.FROAKIE: + case Species.FROGADIER: case Species.VIVILLON: case Species.FLABEBE: case Species.FLOETTE: @@ -1066,6 +1053,10 @@ export default class BattleScene extends SceneBase { case Species.TATSUGIRI: case Species.PALDEA_TAUROS: return Utils.randSeedInt(species.forms.length); + case Species.GRENINJA: + return Utils.randSeedInt(2); + case Species.ZYGARDE: + return Utils.randSeedInt(3); case Species.MINIOR: return Utils.randSeedInt(6); case Species.ALCREMIE: diff --git a/src/data/ability.ts b/src/data/ability.ts index f6ccf7e856d..281a37cfd0c 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1148,6 +1148,26 @@ class PostVictoryStatChangeAbAttr extends PostVictoryAbAttr { } } +export class PostVictoryFormChangeAbAttr extends PostVictoryAbAttr { + private formFunc: (p: Pokemon) => integer; + + constructor(formFunc: ((p: Pokemon) => integer)) { + super(true); + + this.formFunc = formFunc; + } + + applyPostVictory(pokemon: Pokemon, passive: boolean, args: any[]): boolean | Promise { + const formIndex = this.formFunc(pokemon); + if (formIndex !== pokemon.formIndex) { + pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false); + return true; + } + + return false; + } +} + export class PostKnockOutAbAttr extends AbAttr { applyPostKnockOut(pokemon: Pokemon, passive: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise { return false; @@ -3067,17 +3087,21 @@ export function initAbilities() { .ignorable() .partial(), new Ability(Abilities.BATTLE_BOND, 7) + .attr(PostVictoryFormChangeAbAttr, p => p.getFormKey() ? 2 : 1) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) .attr(UnsuppressableAbilityAbAttr) .attr(NoFusionAbilityAbAttr) - .unimplemented(), - new Ability(Abilities.POWER_CONSTRUCT, 7) + .partial(), + new Ability(Abilities.POWER_CONSTRUCT, 7) // TODO: 10% Power Construct Zygarde isn't accounted for yet. If changed, update Zygarde's getSpeciesFormIndex entry accordingly + .attr(PostBattleInitFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2) + .attr(PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2) + .attr(PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2) .attr(UncopiableAbilityAbAttr) .attr(UnswappableAbilityAbAttr) .attr(UnsuppressableAbilityAbAttr) .attr(NoFusionAbilityAbAttr) - .unimplemented(), + .partial(), new Ability(Abilities.CORROSION, 7) .unimplemented(), new Ability(Abilities.COMATOSE, 7) diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts index f2b9a55d3fa..800c9a0ef25 100644 --- a/src/data/egg-moves.ts +++ b/src/data/egg-moves.ts @@ -62,7 +62,7 @@ export const speciesEggMoves = { [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.LIQUIDATION, Moves.DRAGON_ASCENT ], [Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.BOOMBURST ], [Species.DITTO]: [ Moves.MIMIC, Moves.COPYCAT, Moves.ME_FIRST, Moves.METRONOME ], - [Species.EEVEE]: [ Moves.WISH, Moves.REVELATION_DANCE, Moves.SIZZLY_SLIDE, Moves.NO_RETREAT ], + [Species.EEVEE]: [ Moves.WISH, Moves.REVELATION_DANCE, Moves.TRI_ATTACK, Moves.NO_RETREAT ], [Species.PORYGON]: [ Moves.BUZZY_BUZZ, Moves.AURA_SPHERE, Moves.TOPSY_TURVY, Moves.TECHNO_BLAST ], [Species.OMANYTE]: [ Moves.SCALD, Moves.EARTH_POWER, Moves.POWER_GEM, Moves.STRENGTH_SAP ], [Species.KABUTO]: [ Moves.CEASELESS_EDGE, Moves.DRILL_RUN, Moves.AQUA_CUTTER, Moves.MIGHTY_CLEAVE ], @@ -81,7 +81,7 @@ export const speciesEggMoves = { [Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.THIEF, Moves.PARTING_SHOT, Moves.SPORE ], [Species.SPINARAK]: [ Moves.PARTING_SHOT, Moves.MEGAHORN, Moves.SILK_TRAP, Moves.STRENGTH_SAP ], [Species.CHINCHOU]: [ Moves.THUNDERCLAP, Moves.BOUNCY_BUBBLE, Moves.VOLT_SWITCH, Moves.TAIL_GLOW ], - [Species.PICHU]: [ Moves.PIKA_PAPOW, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.ZIPPY_ZAP ], + [Species.PICHU]: [ Moves.THUNDERCLAP, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.THUNDER_CAGE ], [Species.CLEFFA]: [ Moves.TAKE_HEART, Moves.POWER_GEM, Moves.WISH, Moves.LIGHT_OF_RUIN ], [Species.IGGLYBUFF]: [ Moves.MOONBLAST, Moves.APPLE_ACID, Moves.WISH, Moves.BOOMBURST ], [Species.TOGEPI]: [ Moves.SCORCHING_SANDS, Moves.ROOST, Moves.MOONBLAST, Moves.FIERY_DANCE ], diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index 421488629ae..87094af2028 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -542,11 +542,21 @@ export const pokemonFormChanges: PokemonFormChanges = { new SpeciesFormChange(Species.MELOETTA, 'pirouette', 'aria', new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true), new SpeciesFormChange(Species.MELOETTA, 'pirouette', 'aria', new SpeciesFormChangeActiveTrigger(false), true) ], + [Species.GRENINJA]: [ + new SpeciesFormChange(Species.GRENINJA, 'battle-bond', 'ash', new SpeciesFormChangeManualTrigger(), true), + new SpeciesFormChange(Species.GRENINJA, 'ash', 'battle-bond', new SpeciesFormChangeManualTrigger(), true) + ], [Species.AEGISLASH]: [ new SpeciesFormChange(Species.AEGISLASH, 'blade', 'shield', new SpeciesFormChangePreMoveTrigger(Moves.KINGS_SHIELD), true, new SpeciesFormChangeCondition(p => p.hasAbility(Abilities.STANCE_CHANGE))), new SpeciesFormChange(Species.AEGISLASH, 'shield', 'blade', new SpeciesFormChangePreMoveTrigger(m => allMoves[m].category !== MoveCategory.STATUS), true, new SpeciesFormChangeCondition(p => p.hasAbility(Abilities.STANCE_CHANGE))), new SpeciesFormChange(Species.AEGISLASH, 'blade', 'shield', new SpeciesFormChangeActiveTrigger(false), true) ], + [Species.ZYGARDE]: [ + new SpeciesFormChange(Species.ZYGARDE, '50-pc', 'complete', new SpeciesFormChangeManualTrigger(), true), + new SpeciesFormChange(Species.ZYGARDE, 'complete', '50-pc', new SpeciesFormChangeManualTrigger(), true), + new SpeciesFormChange(Species.ZYGARDE, '10-pc', 'complete', new SpeciesFormChangeManualTrigger(), true), + new SpeciesFormChange(Species.ZYGARDE, 'complete', '10-pc', new SpeciesFormChangeManualTrigger(), true) + ], [Species.DIANCIE]: [ new SpeciesFormChange(Species.DIANCIE, '', SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.DIANCITE)) ], diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts index 5788c9c61c8..07691b01eff 100644 --- a/src/data/pokemon-level-moves.ts +++ b/src/data/pokemon-level-moves.ts @@ -396,9 +396,10 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 36, Moves.THUNDERBOLT ], [ 40, Moves.LIGHT_SCREEN ], [ 44, Moves.THUNDER ], + [ 48, Moves.PIKA_PAPOW ], ], [Species.RAICHU]: [ - [ 0, Moves.THUNDER_PUNCH ], + [ 0, Moves.ZIPPY_ZAP ], [ 1, Moves.TAIL_WHIP ], [ 1, Moves.GROWL ], [ 1, Moves.THUNDER_SHOCK ], @@ -418,7 +419,9 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.ELECTRO_BALL ], [ 1, Moves.PLAY_NICE ], [ 1, Moves.NUZZLE ], + [ 1, Moves.THUNDER_PUNCH ], [ 5, Moves.THUNDERBOLT ], + [ 50, Moves.PIKA_PAPOW ], ], [Species.SANDSHREW]: [ [ 1, Moves.SCRATCH ], @@ -2231,9 +2234,10 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 45, Moves.CHARM ], [ 50, Moves.DOUBLE_EDGE ], [ 55, Moves.LAST_RESORT ], + [ 60, Moves.VEEVEE_VOLLEY ], ], [Species.VAPOREON]: [ - [ 0, Moves.WATER_GUN ], + [ 0, Moves.BOUNCY_BUBBLE ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -2247,19 +2251,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.HAZE ], - [ 25, Moves.WATER_PULSE ], - [ 30, Moves.AURORA_BEAM ], - [ 35, Moves.AQUA_RING ], - [ 40, Moves.MUDDY_WATER ], - [ 45, Moves.ACID_ARMOR ], - [ 50, Moves.HYDRO_PUMP ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.WATER_GUN ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.HAZE ], + [ 30, Moves.WATER_PULSE ], + [ 35, Moves.AURORA_BEAM ], + [ 40, Moves.AQUA_RING ], + [ 45, Moves.MUDDY_WATER ], + [ 50, Moves.ACID_ARMOR ], + [ 55, Moves.HYDRO_PUMP ], + [ 60, Moves.LAST_RESORT ], ], [Species.JOLTEON]: [ - [ 0, Moves.THUNDER_SHOCK ], + [ 0, Moves.BUZZY_BUZZ ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -2273,19 +2278,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.THUNDER_WAVE ], - [ 25, Moves.DOUBLE_KICK ], - [ 30, Moves.THUNDER_FANG ], - [ 35, Moves.PIN_MISSILE ], - [ 40, Moves.DISCHARGE ], - [ 45, Moves.AGILITY ], - [ 50, Moves.THUNDER ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.THUNDER_SHOCK ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.THUNDER_WAVE ], + [ 30, Moves.DOUBLE_KICK ], + [ 35, Moves.THUNDER_FANG ], + [ 40, Moves.PIN_MISSILE ], + [ 45, Moves.DISCHARGE ], + [ 50, Moves.AGILITY ], + [ 55, Moves.THUNDER ], + [ 60, Moves.LAST_RESORT ], ], [Species.FLAREON]: [ - [ 0, Moves.EMBER ], + [ 0, Moves.SIZZLY_SLIDE ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -2298,16 +2304,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.SMOG ], - [ 25, Moves.BITE ], - [ 30, Moves.FIRE_FANG ], - [ 35, Moves.FIRE_SPIN ], - [ 40, Moves.LAVA_PLUME ], - [ 45, Moves.SCARY_FACE ], - [ 50, Moves.FLARE_BLITZ ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.EMBER ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.SMOG ], + [ 30, Moves.BITE ], + [ 35, Moves.FIRE_FANG ], + [ 40, Moves.FIRE_SPIN ], + [ 45, Moves.LAVA_PLUME ], + [ 50, Moves.SCARY_FACE ], + [ 55, Moves.FLARE_BLITZ ], + [ 60, Moves.LAST_RESORT ], ], [Species.PORYGON]: [ [ 1, Moves.TACKLE ], @@ -3325,7 +3332,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 52, Moves.EARTHQUAKE ], ], [Species.ESPEON]: [ - [ 0, Moves.CONFUSION ], + [ 0, Moves.GLITZY_GLOW ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -3338,19 +3345,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.SWIFT ], - [ 25, Moves.PSYBEAM ], - [ 30, Moves.MORNING_SUN ], - [ 35, Moves.POWER_SWAP ], - [ 40, Moves.PSYCHIC ], - [ 45, Moves.PSYCH_UP ], - [ 50, Moves.FUTURE_SIGHT ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.CONFUSION ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.SWIFT ], + [ 30, Moves.PSYBEAM ], + [ 35, Moves.MORNING_SUN ], + [ 40, Moves.POWER_SWAP ], + [ 45, Moves.PSYCHIC ], + [ 50, Moves.PSYCH_UP ], + [ 55, Moves.FUTURE_SIGHT ], + [ 60, Moves.LAST_RESORT ], ], [Species.UMBREON]: [ - [ 0, Moves.SNARL ], + [ 0, Moves.BADDY_BAD ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -3364,16 +3372,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.CONFUSE_RAY ], - [ 25, Moves.ASSURANCE ], - [ 30, Moves.MOONLIGHT ], - [ 35, Moves.GUARD_SWAP ], - [ 40, Moves.DARK_PULSE ], - [ 45, Moves.SCREECH ], - [ 50, Moves.MEAN_LOOK ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.SNARL ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.CONFUSE_RAY ], + [ 30, Moves.ASSURANCE ], + [ 35, Moves.MOONLIGHT ], + [ 40, Moves.GUARD_SWAP ], + [ 45, Moves.DARK_PULSE ], + [ 50, Moves.SCREECH ], + [ 55, Moves.MEAN_LOOK ], + [ 60, Moves.LAST_RESORT ], ], [Species.MURKROW]: [ [ 1, Moves.PECK ], @@ -5586,7 +5595,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [Species.SPINDA]: [ [ 1, Moves.TACKLE ], [ 5, Moves.COPYCAT ], - [ 10, Moves.TEETER_DANCE ], + [ 10, Moves.DIZZY_PUNCH ], [ 14, Moves.PSYBEAM ], [ 19, Moves.HYPNOSIS ], [ 23, Moves.BODY_SLAM ], @@ -7932,7 +7941,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 49, Moves.U_TURN ], ], [Species.LEAFEON]: [ - [ 0, Moves.RAZOR_LEAF ], + [ 0, Moves.SAPPY_SEED ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -7946,19 +7955,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.LEECH_SEED ], - [ 25, Moves.MAGICAL_LEAF ], - [ 30, Moves.SYNTHESIS ], - [ 35, Moves.SUNNY_DAY ], - [ 40, Moves.GIGA_DRAIN ], - [ 45, Moves.SWORDS_DANCE ], - [ 50, Moves.LEAF_BLADE ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.RAZOR_LEAF ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.LEECH_SEED ], + [ 30, Moves.MAGICAL_LEAF ], + [ 35, Moves.SYNTHESIS ], + [ 40, Moves.SUNNY_DAY ], + [ 45, Moves.GIGA_DRAIN ], + [ 50, Moves.SWORDS_DANCE ], + [ 55, Moves.LEAF_BLADE ], + [ 60, Moves.LAST_RESORT ], ], [Species.GLACEON]: [ - [ 0, Moves.ICY_WIND ], + [ 0, Moves.FREEZY_FROST ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -7971,16 +7981,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.ICE_SHARD ], - [ 25, Moves.BITE ], - [ 30, Moves.ICE_FANG ], - [ 35, Moves.SNOWSCAPE ], - [ 40, Moves.FREEZE_DRY ], - [ 45, Moves.MIRROR_COAT ], - [ 50, Moves.BLIZZARD ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.ICY_WIND ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.ICE_SHARD ], + [ 30, Moves.BITE ], + [ 35, Moves.ICE_FANG ], + [ 40, Moves.SNOWSCAPE ], + [ 45, Moves.FREEZE_DRY ], + [ 50, Moves.MIRROR_COAT ], + [ 55, Moves.BLIZZARD ], + [ 60, Moves.LAST_RESORT ], ], [Species.GLISCOR]: [ [ 1, Moves.SAND_ATTACK ], @@ -11822,7 +11833,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 66, Moves.HYPER_BEAM ], ], [Species.SYLVEON]: [ - [ 0, Moves.DISARMING_VOICE ], + [ 0, Moves.SPARKLY_SWIRL ], [ 1, Moves.TACKLE ], [ 1, Moves.TAKE_DOWN ], [ 1, Moves.DOUBLE_EDGE ], @@ -11835,16 +11846,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.COVET ], [ 1, Moves.COPYCAT ], [ 5, Moves.SAND_ATTACK ], - [ 10, Moves.QUICK_ATTACK ], - [ 15, Moves.BABY_DOLL_EYES ], - [ 20, Moves.SWIFT ], - [ 25, Moves.LIGHT_SCREEN ], - [ 30, Moves.DRAINING_KISS ], - [ 35, Moves.MISTY_TERRAIN ], - [ 40, Moves.SKILL_SWAP ], - [ 45, Moves.PSYCH_UP ], - [ 50, Moves.MOONBLAST ], - [ 55, Moves.LAST_RESORT ], + [ 10, Moves.DISARMING_VOICE ], + [ 15, Moves.QUICK_ATTACK ], + [ 20, Moves.BABY_DOLL_EYES ], + [ 25, Moves.SWIFT ], + [ 30, Moves.LIGHT_SCREEN ], + [ 35, Moves.DRAINING_KISS ], + [ 40, Moves.MISTY_TERRAIN ], + [ 45, Moves.SKILL_SWAP ], + [ 50, Moves.PSYCH_UP ], + [ 55, Moves.MOONBLAST ], + [ 60, Moves.LAST_RESORT ], ], [Species.HAWLUCHA]: [ [ 1, Moves.TACKLE ], @@ -17237,6 +17249,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { ], [Species.ALOLA_RAICHU]: [ [ 0, Moves.PSYCHIC ], + [ 0, Moves.ZIPPY_ZAP ], [ 1, Moves.TAIL_WHIP ], [ 1, Moves.GROWL ], [ 1, Moves.THUNDER_SHOCK ], @@ -17257,6 +17270,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 1, Moves.PLAY_NICE ], [ 1, Moves.NUZZLE ], [ 5, Moves.THUNDERBOLT ], + [ 50, Moves.PIKA_PAPOW ], ], [Species.ALOLA_SANDSHREW]: [ [ 1, Moves.SCRATCH ], diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index f1c1e8bbbe2..4136be5b70f 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1748,8 +1748,14 @@ export function initSpecies() { new PokemonSpecies(Species.FENNEKIN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 0.4, 9.4, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 307, 40, 45, 40, 62, 60, 60, 45, 70, 61, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.BRAIXEN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 1, 14.5, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 409, 59, 59, 58, 90, 70, 73, 45, 70, 143, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", Type.FIRE, Type.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false), - new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), + new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false, + new PokemonForm("Normal", "", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63), + new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, ""), + ), + new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false, + new PokemonForm("Normal", "", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142), + new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, ""), + ), new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false, false, new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239), new PokemonForm("Battle Bond", "battle-bond", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, false, ""), diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts index 4cf025e3650..348976eae92 100644 --- a/src/data/trainer-names.ts +++ b/src/data/trainer-names.ts @@ -97,7 +97,7 @@ export const trainerNamePools = { [TrainerType.MAID]: ["Belinda","Sophie","Emily","Elena","Clare","Alica","Tanya","Tammy"], [TrainerType.MUSICIAN]: ["Boris","Preston","Charles","Clyde","Vincent","Dalton","Kirk","Shawn","Fabian","Fernando","Joseph","Marcos","Arturo","Jerry","Lonnie","Tony"], [TrainerType.NURSERY_AIDE]: ["Autumn","Briana","Leah","Miho","Ethel","Hollie","Ilse","June","Kimya","Rosalyn"], - [TrainerType.OFFICER]: ["Dirk","Keith","Alex","Bobby","Caleb","Danny","Dylan","Thomas","Daniel","Jeff","Braven","Dell","Neagle","Haruki","Mitchell","Sheriff","Raymond"], + [TrainerType.OFFICER]: ["Dirk","Keith","Alex","Bobby","Caleb","Danny","Dylan","Thomas","Daniel","Jeff","Braven","Dell","Neagle","Haruki","Mitchell","Raymond"], [TrainerType.PARASOL_LADY]: ["Angelica","Clarissa","Madeline","Akari","Annabell","Kayley","Rachel","Alexa","Sabrina","April","Gwyneth","Laura","Lumi","Mariah","Melita","Nicole","Tihana","Ingrid","Tyra"], [TrainerType.PILOT]: ["Chase","Leonard","Ted","Elron","Ewing","Flynn","Winslow"], [TrainerType.POKEFAN]: [["Alex","Allan","Brandon","Carter","Colin","Derek","Jeremy","Joshua","Rex","Robert","Trevor","William","Colton","Miguel","Francisco","Kaleb","Leonard","Boone","Elliot","Jude","Norbert","Corey","Gabe","Baxter"],["Beverly","Georgia","Jaime","Ruth","Isabel","Marissa","Vanessa","Annika","Bethany","Kimberly","Meredith","Rebekah","Eleanor","Darcy","Lydia","Sachiko","Abigail","Agnes","Lydie","Roisin","Tara","Carmen","Janet"]], diff --git a/src/field/arena.ts b/src/field/arena.ts index 910d998d68e..5b14560d407 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -18,8 +18,7 @@ import { TimeOfDay } from "../data/enums/time-of-day"; import { Terrain, TerrainType } from "../data/terrain"; import { PostTerrainChangeAbAttr, PostWeatherChangeAbAttr, applyPostTerrainChangeAbAttrs, applyPostWeatherChangeAbAttrs } from "../data/ability"; import Pokemon from "./pokemon"; - -const WEATHER_OVERRIDE = WeatherType.NONE; +import { WEATHER_OVERRIDE } from '../overrides'; export class Arena { public scene: BattleScene; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 4e20bad407b..44573542fe8 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, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../battle-scene'; +import BattleScene, { AnySound } 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'; @@ -43,6 +43,7 @@ import { Nature, getNatureStatMultiplier } from '../data/nature'; import { SpeciesFormChange, SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from '../data/pokemon-forms'; import { TerrainType } from '../data/terrain'; import { TrainerSlot } from '../data/trainer-config'; +import { ABILITY_OVERRIDE, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../overrides'; export enum FieldPosition { CENTER, diff --git a/src/game-mode.ts b/src/game-mode.ts index 0ac3f0503f1..76c97b4c9ac 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -1,10 +1,11 @@ import { fixedBattles } from "./battle"; -import BattleScene, { STARTING_BIOME_OVERRIDE, STARTING_LEVEL_OVERRIDE, STARTING_MONEY_OVERRIDE } from "./battle-scene"; +import BattleScene from "./battle-scene"; import { Biome } from "./data/enums/biome"; import { Species } from "./data/enums/species"; import PokemonSpecies, { allSpecies } from "./data/pokemon-species"; import { Arena } from "./field/arena"; import * as Utils from "./utils"; +import { STARTING_BIOME_OVERRIDE, STARTING_LEVEL_OVERRIDE, STARTING_MONEY_OVERRIDE } from './overrides'; export enum GameModes { CLASSIC, diff --git a/src/locales/de/menu.ts b/src/locales/de/menu.ts index d70cd83c50d..4876fa3432a 100644 --- a/src/locales/de/menu.ts +++ b/src/locales/de/menu.ts @@ -59,4 +59,9 @@ export const menu: SimpleTranslationEntries = { "escapeVerbSwitch": "auswechseln", "escapeVerbFlee": "flucht", "notDisabled": "{{moveName}} ist\nnicht mehr deaktiviert!", + "rankings": "Rankings", + "dailyRankings": "Daily Rankings", + "noRankings": "No Rankings", + "loading": "Loading…", + "playersOnline": "Players Online" } as const; \ No newline at end of file diff --git a/src/locales/en/menu.ts b/src/locales/en/menu.ts index bce59c02c11..1d840a3eb03 100644 --- a/src/locales/en/menu.ts +++ b/src/locales/en/menu.ts @@ -78,4 +78,9 @@ export const menu: SimpleTranslationEntries = { "skipItemQuestion": "Are you sure you want to skip taking an item?", "eggHatching": "Oh?", "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?", + "rankings": "Rankings", + "dailyRankings": "Daily Rankings", + "noRankings": "No Rankings", + "loading": "Loading…", + "playersOnline": "Players Online" } as const; \ No newline at end of file diff --git a/src/locales/es/menu.ts b/src/locales/es/menu.ts index dc1c50b3821..e72710cee37 100644 --- a/src/locales/es/menu.ts +++ b/src/locales/es/menu.ts @@ -61,5 +61,10 @@ export const menu: SimpleTranslationEntries = { "notDisabled": "¡El movimiento {{moveName}}\nya no está anulado!", "skipItemQuestion": "¿Estás seguro de que no quieres coger un objeto?", "eggHatching": "¿Y esto?", - "ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?" + "ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?", + "rankings": "Rankings", + "dailyRankings": "Daily Rankings", + "noRankings": "No Rankings", + "loading": "Loading…", + "playersOnline": "Players Online" } as const; \ No newline at end of file diff --git a/src/locales/fr/menu.ts b/src/locales/fr/menu.ts index 015132bc6c5..911445bcdca 100644 --- a/src/locales/fr/menu.ts +++ b/src/locales/fr/menu.ts @@ -73,4 +73,9 @@ export const menu: SimpleTranslationEntries = { "skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre d’objet ?", "eggHatching": "Oh ?", "ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?", + "rankings": "Rankings", + "dailyRankings": "Daily Rankings", + "noRankings": "No Rankings", + "loading": "Loading…", + "playersOnline": "Players Online" } as const; diff --git a/src/locales/it/menu.ts b/src/locales/it/menu.ts index 872315d77c0..b9e288c26ce 100644 --- a/src/locales/it/menu.ts +++ b/src/locales/it/menu.ts @@ -6,5 +6,10 @@ export const menu: SimpleTranslationEntries = { "newGame": "Nuova Partita", "loadGame": "Carica Partita", "dailyRun": "Corsa Giornaliera (Beta)", - "selectGameMode": "Seleziona una modalità di gioco." + "selectGameMode": "Seleziona una modalità di gioco.", + "rankings": "Rankings", + "dailyRankings": "Daily Rankings", + "noRankings": "No Rankings", + "loading": "Loading…", + "playersOnline": "Players Online" } as const; \ No newline at end of file diff --git a/src/overrides.ts b/src/overrides.ts new file mode 100644 index 00000000000..732b1a5a45b --- /dev/null +++ b/src/overrides.ts @@ -0,0 +1,23 @@ +import { Species } from './data/enums/species'; +import { Abilities } from "./data/enums/abilities"; +import { Biome } from "./data/enums/biome"; +import { Moves } from "./data/enums/moves"; +import { WeatherType } from "./data/weather"; + +export const SEED_OVERRIDE = ''; +export const STARTER_SPECIES_OVERRIDE = 0; +export const STARTER_FORM_OVERRIDE = 0; +export const STARTING_LEVEL_OVERRIDE = 0; +export const STARTING_WAVE_OVERRIDE = 0; +export const STARTING_BIOME_OVERRIDE = Biome.TOWN; +export const STARTING_MONEY_OVERRIDE = 0; +export const WEATHER_OVERRIDE = WeatherType.NONE; + +export const ABILITY_OVERRIDE = Abilities.NONE; +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; diff --git a/src/phases.ts b/src/phases.ts index fdca671dbff..8934104ed80 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1,8 +1,8 @@ -import BattleScene, { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE, bypassLogin, startingWave } from "./battle-scene"; +import BattleScene, { bypassLogin, startingWave } from "./battle-scene"; import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove, MoveResult, DamageResult, FieldPosition, HitResult, TurnMove } from "./field/pokemon"; import * as Utils from './utils'; import { Moves } from "./data/enums/moves"; -import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, OneHitKOAttr, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, DelayedAttackAttr, RechargeAttr, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, FixedDamageAttr, OneHitKOAccuracyAttr } from "./data/move"; +import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, OneHitKOAttr, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, DelayedAttackAttr, RechargeAttr, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, FixedDamageAttr, OneHitKOAccuracyAttr, ForceSwitchOutAttr } from "./data/move"; import { Mode } from './ui/ui'; import { Command } from "./ui/command-ui-handler"; import { Stat } from "./data/pokemon-stat"; @@ -57,6 +57,7 @@ import { fetchDailyRunSeed, getDailyRunStarters } from "./data/daily-run"; import { GameModes, gameModes } from "./game-mode"; import { getPokemonSpecies, speciesStarters } from "./data/pokemon-species"; import i18next from './plugins/i18n'; +import { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE } from './overrides'; export class LoginPhase extends Phase { private showText: boolean; @@ -1420,9 +1421,11 @@ export class SwitchSummonPhase extends SummonPhase { super.onEnd(); const pokemon = this.getPokemon(); + const moveId = pokemon.scene.currentBattle.turnCommands[this.fieldIndex]?.move?.move; + const lastUsedMove = moveId ? allMoves[moveId] : undefined; // Compensate for turn spent summoning - if (pokemon.scene.currentBattle.turnCommands[this.fieldIndex]?.command === Command.POKEMON) + if (pokemon.scene.currentBattle.turnCommands[this.fieldIndex]?.command === Command.POKEMON || !!lastUsedMove?.findAttr(attr => attr instanceof ForceSwitchOutAttr)) //check if hard switch OR pivot move was used pokemon.battleSummonData.turnCount--; if (this.batonPass && pokemon) diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/daily-run-scoreboard.ts index 90fef5ba5e4..1379ec6a8ef 100644 --- a/src/ui/daily-run-scoreboard.ts +++ b/src/ui/daily-run-scoreboard.ts @@ -2,6 +2,7 @@ import BattleScene from "../battle-scene"; import { TextStyle, addTextObject } from "./text"; import { WindowVariant, addWindow } from "./ui-theme"; import * as Utils from "../utils"; +import i18next from "i18next"; interface RankingEntry { rank: integer, @@ -39,7 +40,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { const titleWindow = addWindow(this.scene, 0, 0, 114, 18, false, false, null, null, WindowVariant.THIN); this.add(titleWindow); - this.titleLabel = addTextObject(this.scene, titleWindow.displayWidth / 2, titleWindow.displayHeight / 2, 'Daily Rankings', TextStyle.WINDOW, { fontSize: '64px' }); + this.titleLabel = addTextObject(this.scene, titleWindow.displayWidth / 2, titleWindow.displayHeight / 2, i18next.t('menu:dailyRankings'), TextStyle.WINDOW, { fontSize: '64px' }); this.titleLabel.setOrigin(0.5, 0.5); this.add(this.titleLabel); @@ -141,7 +142,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { update(category: ScoreboardCategory = this.category, page: integer = this.page) { this.rankingsContainer.removeAll(true); - this.loadingLabel.setText('Loading…'); + this.loadingLabel.setText(i18next.t('menu:loading')); this.loadingLabel.setVisible(true); if (category !== this.category) @@ -155,7 +156,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { .then(jsonResponse => { this.page = page; this.category = category; - this.titleLabel.setText(`${Utils.toReadableString(ScoreboardCategory[category])} Rankings`); + this.titleLabel.setText(`${Utils.toReadableString(ScoreboardCategory[category])} ${i18next.t("menu:rankings")}`); this.prevPageButton.setAlpha(page > 1 ? 1 : 0.5); this.nextPageButton.setAlpha(page < this.pageCount ? 1 : 0.5); this.pageNumberLabel.setText(page.toString()); @@ -163,7 +164,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container { this.loadingLabel.setVisible(false); this.updateRankings(jsonResponse); } else - this.loadingLabel.setText('No Rankings'); + this.loadingLabel.setText(i18next.t('menu:noRankings')); }); }); } diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index 6c96e475929..c430764e4da 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -5,6 +5,7 @@ import { Mode } from "./ui"; import * as Utils from "../utils"; import { TextStyle, addTextObject } from "./text"; import { battleCountSplashMessage, splashMessages } from "../data/splash-messages"; +import i18next from "i18next"; export default class TitleUiHandler extends OptionSelectUiHandler { private titleContainer: Phaser.GameObjects.Container; @@ -37,7 +38,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler { this.titleContainer.add(this.dailyRunScoreboard); - this.playerCountLabel = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 90, '? Players Online', TextStyle.MESSAGE, { fontSize: '54px' }); + this.playerCountLabel = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 90, `? ${i18next.t("menu:playersOnline")}`, TextStyle.MESSAGE, { fontSize: '54px' }); this.playerCountLabel.setOrigin(1, 0); this.titleContainer.add(this.playerCountLabel); @@ -61,7 +62,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler { Utils.apiFetch(`game/titlestats`) .then(request => request.json()) .then(stats => { - this.playerCountLabel.setText(`${stats.playerCount} Players Online`); + this.playerCountLabel.setText(`${stats.playerCount} ${i18next.t("menu:playersOnline")}`); if (this.splashMessage === battleCountSplashMessage) this.splashMessageText.setText(battleCountSplashMessage.replace('{COUNT}', stats.battleCount.toLocaleString('en-US'))); });