diff --git a/public/images/pokemon/icons/7/791-radiant-sun.png b/public/images/pokemon/icons/7/791-radiant-sun.png deleted file mode 100644 index ac53b40b0e6..00000000000 Binary files a/public/images/pokemon/icons/7/791-radiant-sun.png and /dev/null differ diff --git a/public/images/pokemon/icons/7/791s-radiant-sun.png b/public/images/pokemon/icons/7/791s-radiant-sun.png deleted file mode 100644 index d6b33d6618f..00000000000 Binary files a/public/images/pokemon/icons/7/791s-radiant-sun.png and /dev/null differ diff --git a/public/images/pokemon/icons/7/792-full-moon.png b/public/images/pokemon/icons/7/792-full-moon.png deleted file mode 100644 index 6e77f626e94..00000000000 Binary files a/public/images/pokemon/icons/7/792-full-moon.png and /dev/null differ diff --git a/public/images/pokemon/icons/7/792s-full-moon.png b/public/images/pokemon/icons/7/792s-full-moon.png deleted file mode 100644 index e65ad88fd78..00000000000 Binary files a/public/images/pokemon/icons/7/792s-full-moon.png and /dev/null differ diff --git a/public/images/pokemon_icons_7.json b/public/images/pokemon_icons_7.json index d5faa4e8b02..03eeba88a70 100644 --- a/public/images/pokemon_icons_7.json +++ b/public/images/pokemon_icons_7.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_7.png", "format": "RGBA8888", "size": { - "w": 250, - "h": 672 + "w": 502, + "h": 325 }, "scale": 1, "frames": [ @@ -345,132 +345,6 @@ "h": 29 } }, - { - "filename": "795", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 322, - "w": 28, - "h": 30 - } - }, - { - "filename": "795s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 352, - "w": 28, - "h": 30 - } - }, - { - "filename": "800", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 382, - "w": 28, - "h": 30 - } - }, - { - "filename": "800s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 412, - "w": 28, - "h": 30 - } - }, - { - "filename": "805", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 442, - "w": 28, - "h": 30 - } - }, - { - "filename": "805s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 28, - "h": 30 - }, - "frame": { - "x": 0, - "y": 472, - "w": 28, - "h": 30 - } - }, { "filename": "809-gigantamax", "rotated": false, @@ -513,27 +387,6 @@ "h": 28 } }, - { - "filename": "791-radiant-sun", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 29, - "h": 28 - }, - "frame": { - "x": 142, - "y": 0, - "w": 29, - "h": 28 - } - }, { "filename": "791", "rotated": false, @@ -549,28 +402,7 @@ "h": 28 }, "frame": { - "x": 138, - "y": 28, - "w": 29, - "h": 28 - } - }, - { - "filename": "791s-radiant-sun", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 29, - "h": 28 - }, - "frame": { - "x": 171, + "x": 142, "y": 0, "w": 29, "h": 28 @@ -591,138 +423,12 @@ "h": 28 }, "frame": { - "x": 167, + "x": 138, "y": 28, "w": 29, "h": 28 } }, - { - "filename": "773-bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 502, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 532, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 562, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 592, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-fairy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 0, - "y": 622, - "w": 26, - "h": 30 - } - }, - { - "filename": "789", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 0, - "y": 652, - "w": 23, - "h": 20 - } - }, { "filename": "784", "rotated": false, @@ -737,6 +443,27 @@ "w": 29, "h": 27 }, + "frame": { + "x": 171, + "y": 0, + "w": 29, + "h": 27 + } + }, + { + "filename": "784s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 29, + "h": 27 + }, "frame": { "x": 200, "y": 0, @@ -745,7 +472,7 @@ } }, { - "filename": "2103", + "filename": "730", "rotated": false, "trimmed": true, "sourceSize": { @@ -753,20 +480,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 21, - "h": 30 + "x": 6, + "y": 2, + "w": 28, + "h": 27 }, "frame": { "x": 229, "y": 0, - "w": 21, - "h": 30 + "w": 28, + "h": 27 } }, { - "filename": "773-fighting", + "filename": "730s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 28, + "h": 27 + }, + "frame": { + "x": 257, + "y": 0, + "w": 28, + "h": 27 + } + }, + { + "filename": "740", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 32, + "h": 23 + }, + "frame": { + "x": 285, + "y": 0, + "w": 32, + "h": 23 + } + }, + { + "filename": "740s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 4, + "y": 4, + "w": 32, + "h": 23 + }, + "frame": { + "x": 317, + "y": 0, + "w": 32, + "h": 23 + } + }, + { + "filename": "795", "rotated": false, "trimmed": true, "sourceSize": { @@ -776,18 +566,18 @@ "spriteSourceSize": { "x": 7, "y": 0, - "w": 26, + "w": 28, "h": 30 }, "frame": { "x": 34, "y": 85, - "w": 26, + "w": 28, "h": 30 } }, { - "filename": "773-fire", + "filename": "795s", "rotated": false, "trimmed": true, "sourceSize": { @@ -797,18 +587,18 @@ "spriteSourceSize": { "x": 7, "y": 0, - "w": 26, + "w": 28, "h": 30 }, "frame": { "x": 34, "y": 115, - "w": 26, + "w": 28, "h": 30 } }, { - "filename": "773-flying", + "filename": "800", "rotated": false, "trimmed": true, "sourceSize": { @@ -818,18 +608,18 @@ "spriteSourceSize": { "x": 7, "y": 0, - "w": 26, + "w": 28, "h": 30 }, "frame": { "x": 32, "y": 145, - "w": 26, + "w": 28, "h": 30 } }, { - "filename": "773-ghost", + "filename": "800s", "rotated": false, "trimmed": true, "sourceSize": { @@ -839,18 +629,18 @@ "spriteSourceSize": { "x": 7, "y": 0, - "w": 26, + "w": 28, "h": 30 }, "frame": { "x": 32, "y": 175, - "w": 26, + "w": 28, "h": 30 } }, { - "filename": "773-grass", + "filename": "805", "rotated": false, "trimmed": true, "sourceSize": { @@ -858,20 +648,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 6, "y": 0, - "w": 26, + "w": 28, "h": 30 }, "frame": { "x": 31, "y": 205, - "w": 26, + "w": 28, "h": 30 } }, { - "filename": "773-ground", + "filename": "805s", "rotated": false, "trimmed": true, "sourceSize": { @@ -879,20 +669,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 6, "y": 0, - "w": 26, + "w": 28, "h": 30 }, "frame": { "x": 31, "y": 235, - "w": 26, + "w": 28, "h": 30 } }, { - "filename": "773-ice", + "filename": "773-bug", "rotated": false, "trimmed": true, "sourceSize": { @@ -913,7 +703,7 @@ } }, { - "filename": "730", + "filename": "773-dark", "rotated": false, "trimmed": true, "sourceSize": { @@ -921,20 +711,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 27 + "x": 7, + "y": 0, + "w": 26, + "h": 30 }, "frame": { "x": 31, "y": 295, - "w": 28, - "h": 27 + "w": 26, + "h": 30 } }, { - "filename": "773-poison", + "filename": "2038", "rotated": false, "trimmed": true, "sourceSize": { @@ -942,20 +732,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 8, + "y": 4, + "w": 30, + "h": 25 + }, + "frame": { + "x": 349, "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 28, - "y": 322, - "w": 26, - "h": 30 + "w": 30, + "h": 25 } }, { - "filename": "773-psychic", + "filename": "2038s", "rotated": false, "trimmed": true, "sourceSize": { @@ -963,230 +753,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 8, + "y": 4, + "w": 30, + "h": 25 + }, + "frame": { + "x": 379, "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 28, - "y": 352, - "w": 26, - "h": 30 + "w": 30, + "h": 25 } }, { - "filename": "773-rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 28, - "y": 382, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-steel", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 28, - "y": 412, - "w": 26, - "h": 30 - } - }, - { - "filename": "773-water", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 28, - "y": 442, - "w": 26, - "h": 30 - } - }, - { - "filename": "773", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 28, - "y": 472, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 502, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 532, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 562, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 592, - "w": 26, - "h": 30 - } - }, - { - "filename": "773s-fairy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 26, - "h": 30 - }, - "frame": { - "x": 26, - "y": 622, - "w": 26, - "h": 30 - } - }, - { - "filename": "789s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 23, - "y": 652, - "w": 23, - "h": 20 - } - }, - { - "filename": "784s", + "filename": "785", "rotated": false, "trimmed": true, "sourceSize": { @@ -1196,18 +776,18 @@ "spriteSourceSize": { "x": 7, "y": 3, - "w": 29, - "h": 27 + "w": 28, + "h": 26 }, "frame": { - "x": 70, - "y": 57, - "w": 29, - "h": 27 + "x": 409, + "y": 0, + "w": 28, + "h": 26 } }, { - "filename": "747", + "filename": "785s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1215,16 +795,226 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 20 + "x": 7, + "y": 3, + "w": 28, + "h": 26 }, "frame": { - "x": 46, - "y": 652, - "w": 22, - "h": 20 + "x": 437, + "y": 0, + "w": 28, + "h": 26 + } + }, + { + "filename": "792", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 465, + "y": 0, + "w": 28, + "h": 28 + } + }, + { + "filename": "792s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 1, + "w": 28, + "h": 28 + }, + "frame": { + "x": 70, + "y": 57, + "w": 28, + "h": 28 + } + }, + { + "filename": "773-dragon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 62, + "y": 85, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 62, + "y": 115, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-fairy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 60, + "y": 145, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-fighting", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 60, + "y": 175, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-fire", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 59, + "y": 205, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-flying", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 59, + "y": 235, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-ghost", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 57, + "y": 265, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-grass", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 57, + "y": 295, + "w": 26, + "h": 30 } }, { @@ -1242,7 +1032,7 @@ "h": 30 }, "frame": { - "x": 60, + "x": 88, "y": 85, "w": 25, "h": 30 @@ -1263,12 +1053,306 @@ "h": 30 }, "frame": { - "x": 60, + "x": 88, "y": 115, "w": 25, "h": 30 } }, + { + "filename": "773-ground", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 86, + "y": 145, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 86, + "y": 175, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-poison", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 85, + "y": 205, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-psychic", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 85, + "y": 235, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 83, + "y": 265, + "w": 26, + "h": 30 + } + }, + { + "filename": "773-steel", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 83, + "y": 295, + "w": 26, + "h": 30 + } + }, + { + "filename": "772", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 28 + }, + "frame": { + "x": 98, + "y": 57, + "w": 25, + "h": 28 + } + }, + { + "filename": "773-water", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 123, + "y": 56, + "w": 26, + "h": 30 + } + }, + { + "filename": "773", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 149, + "y": 56, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-bug", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 113, + "y": 86, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-dark", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 139, + "y": 86, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-dragon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 113, + "y": 116, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 139, + "y": 116, + "w": 26, + "h": 30 + } + }, + { + "filename": "773s-fairy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 0, + "w": 26, + "h": 30 + }, + "frame": { + "x": 112, + "y": 146, + "w": 26, + "h": 30 + } + }, { "filename": "773s-fighting", "rotated": false, @@ -1284,8 +1368,8 @@ "h": 30 }, "frame": { - "x": 58, - "y": 145, + "x": 138, + "y": 146, "w": 26, "h": 30 } @@ -1305,8 +1389,8 @@ "h": 30 }, "frame": { - "x": 58, - "y": 175, + "x": 112, + "y": 176, "w": 26, "h": 30 } @@ -1326,8 +1410,8 @@ "h": 30 }, "frame": { - "x": 57, - "y": 205, + "x": 138, + "y": 176, "w": 26, "h": 30 } @@ -1347,8 +1431,8 @@ "h": 30 }, "frame": { - "x": 57, - "y": 235, + "x": 111, + "y": 206, "w": 26, "h": 30 } @@ -1368,33 +1452,12 @@ "h": 30 }, "frame": { - "x": 57, - "y": 265, + "x": 137, + "y": 206, "w": 26, "h": 30 } }, - { - "filename": "730s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 28, - "h": 27 - }, - "frame": { - "x": 59, - "y": 295, - "w": 28, - "h": 27 - } - }, { "filename": "773s-ground", "rotated": false, @@ -1410,8 +1473,8 @@ "h": 30 }, "frame": { - "x": 54, - "y": 322, + "x": 111, + "y": 236, "w": 26, "h": 30 } @@ -1431,8 +1494,8 @@ "h": 30 }, "frame": { - "x": 54, - "y": 352, + "x": 137, + "y": 236, "w": 26, "h": 30 } @@ -1452,12 +1515,33 @@ "h": 30 }, "frame": { - "x": 54, - "y": 382, + "x": 109, + "y": 266, "w": 26, "h": 30 } }, + { + "filename": "794", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 29 + }, + "frame": { + "x": 109, + "y": 296, + "w": 25, + "h": 29 + } + }, { "filename": "773s-psychic", "rotated": false, @@ -1473,12 +1557,54 @@ "h": 30 }, "frame": { - "x": 54, - "y": 412, + "x": 135, + "y": 266, "w": 26, "h": 30 } }, + { + "filename": "794s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 29 + }, + "frame": { + "x": 134, + "y": 296, + "w": 25, + "h": 29 + } + }, + { + "filename": "796", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 18, + "h": 29 + }, + "frame": { + "x": 159, + "y": 296, + "w": 18, + "h": 29 + } + }, { "filename": "773s-rock", "rotated": false, @@ -1494,12 +1620,54 @@ "h": 30 }, "frame": { - "x": 54, - "y": 442, + "x": 161, + "y": 266, "w": 26, "h": 30 } }, + { + "filename": "796s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 18, + "h": 29 + }, + "frame": { + "x": 177, + "y": 296, + "w": 18, + "h": 29 + } + }, + { + "filename": "772s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 2, + "w": 25, + "h": 28 + }, + "frame": { + "x": 167, + "y": 28, + "w": 25, + "h": 28 + } + }, { "filename": "773s-steel", "rotated": false, @@ -1515,8 +1683,8 @@ "h": 30 }, "frame": { - "x": 54, - "y": 472, + "x": 192, + "y": 27, "w": 26, "h": 30 } @@ -1536,8 +1704,8 @@ "h": 30 }, "frame": { - "x": 52, - "y": 502, + "x": 218, + "y": 27, "w": 26, "h": 30 } @@ -1557,98 +1725,14 @@ "h": 30 }, "frame": { - "x": 52, - "y": 532, + "x": 244, + "y": 27, "w": 26, "h": 30 } }, { - "filename": "792-full-moon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 52, - "y": 562, - "w": 28, - "h": 28 - } - }, - { - "filename": "792", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 52, - "y": 590, - "w": 28, - "h": 28 - } - }, - { - "filename": "792s-full-moon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 52, - "y": 618, - "w": 28, - "h": 28 - } - }, - { - "filename": "785", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 68, - "y": 646, - "w": 28, - "h": 26 - } - }, - { - "filename": "2103s", + "filename": "2103", "rotated": false, "trimmed": true, "sourceSize": { @@ -1662,264 +1746,12 @@ "h": 30 }, "frame": { - "x": 85, - "y": 84, + "x": 270, + "y": 27, "w": 21, "h": 30 } }, - { - "filename": "794", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 29 - }, - "frame": { - "x": 85, - "y": 114, - "w": 25, - "h": 29 - } - }, - { - "filename": "783", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 21, - "h": 27 - }, - "frame": { - "x": 99, - "y": 57, - "w": 21, - "h": 27 - } - }, - { - "filename": "792s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 1, - "w": 28, - "h": 28 - }, - "frame": { - "x": 120, - "y": 56, - "w": 28, - "h": 28 - } - }, - { - "filename": "740", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 32, - "h": 23 - }, - "frame": { - "x": 106, - "y": 84, - "w": 32, - "h": 23 - } - }, - { - "filename": "740s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 4, - "w": 32, - "h": 23 - }, - "frame": { - "x": 148, - "y": 56, - "w": 32, - "h": 23 - } - }, - { - "filename": "785s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 28, - "h": 26 - }, - "frame": { - "x": 110, - "y": 107, - "w": 28, - "h": 26 - } - }, - { - "filename": "724", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 180, - "y": 56, - "w": 19, - "h": 25 - } - }, - { - "filename": "794s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 29 - }, - "frame": { - "x": 138, - "y": 84, - "w": 25, - "h": 29 - } - }, - { - "filename": "725", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 138, - "y": 113, - "w": 25, - "h": 21 - } - }, - { - "filename": "746-school", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 22 - }, - "frame": { - "x": 110, - "y": 133, - "w": 28, - "h": 22 - } - }, - { - "filename": "725s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 138, - "y": 134, - "w": 25, - "h": 21 - } - }, - { - "filename": "734", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 25, - "h": 16 - }, - "frame": { - "x": 85, - "y": 143, - "w": 25, - "h": 16 - } - }, { "filename": "2026", "rotated": false, @@ -1935,75 +1767,12 @@ "h": 28 }, "frame": { - "x": 84, - "y": 159, + "x": 291, + "y": 23, "w": 26, "h": 28 } }, - { - "filename": "2038", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 30, - "h": 25 - }, - "frame": { - "x": 110, - "y": 155, - "w": 30, - "h": 25 - } - }, - { - "filename": "745-dusk", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 25 - }, - "frame": { - "x": 140, - "y": 155, - "w": 25, - "h": 25 - } - }, - { - "filename": "746s-school", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 28, - "h": 22 - }, - "frame": { - "x": 84, - "y": 187, - "w": 28, - "h": 22 - } - }, { "filename": "2026s", "rotated": false, @@ -2019,14 +1788,14 @@ "h": 28 }, "frame": { - "x": 83, - "y": 209, + "x": 317, + "y": 23, "w": 26, "h": 28 } }, { - "filename": "772", + "filename": "2075", "rotated": false, "trimmed": true, "sourceSize": { @@ -2034,62 +1803,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 28 - }, - "frame": { - "x": 83, - "y": 237, - "w": 25, - "h": 28 - } - }, - { - "filename": "772s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 2, - "w": 25, - "h": 28 - }, - "frame": { - "x": 83, - "y": 265, - "w": 25, - "h": 28 - } - }, - { - "filename": "2038s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, + "x": 7, "y": 4, - "w": 30, - "h": 25 + "w": 29, + "h": 24 }, "frame": { - "x": 112, - "y": 180, - "w": 30, - "h": 25 + "x": 343, + "y": 25, + "w": 29, + "h": 24 } }, { - "filename": "745s-dusk", + "filename": "2075s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2097,20 +1824,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 7, "y": 4, - "w": 25, - "h": 25 + "w": 29, + "h": 24 }, "frame": { - "x": 142, - "y": 180, - "w": 25, - "h": 25 + "x": 372, + "y": 25, + "w": 29, + "h": 24 } }, { - "filename": "783s", + "filename": "746-school", "rotated": false, "trimmed": true, "sourceSize": { @@ -2118,16 +1845,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 21, - "h": 27 + "x": 7, + "y": 5, + "w": 28, + "h": 22 }, "frame": { - "x": 87, - "y": 293, - "w": 21, - "h": 27 + "x": 401, + "y": 26, + "w": 28, + "h": 22 + } + }, + { + "filename": "746s-school", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 28, + "h": 22 + }, + "frame": { + "x": 429, + "y": 26, + "w": 28, + "h": 22 } }, { @@ -2145,54 +1893,12 @@ "h": 24 }, "frame": { - "x": 163, - "y": 79, + "x": 175, + "y": 56, "w": 17, "h": 24 } }, - { - "filename": "796", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 18, - "h": 29 - }, - "frame": { - "x": 163, - "y": 103, - "w": 18, - "h": 29 - } - }, - { - "filename": "745", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 23 - }, - "frame": { - "x": 163, - "y": 132, - "w": 25, - "h": 23 - } - }, { "filename": "748", "rotated": false, @@ -2208,8 +1914,8 @@ "h": 25 }, "frame": { - "x": 165, - "y": 155, + "x": 192, + "y": 57, "w": 26, "h": 25 } @@ -2229,264 +1935,12 @@ "h": 25 }, "frame": { - "x": 167, - "y": 180, + "x": 218, + "y": 57, "w": 26, "h": 25 } }, - { - "filename": "732", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 180, - "y": 81, - "w": 19, - "h": 22 - } - }, - { - "filename": "796s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 18, - "h": 29 - }, - "frame": { - "x": 181, - "y": 103, - "w": 18, - "h": 29 - } - }, - { - "filename": "741-sensu", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 188, - "y": 132, - "w": 17, - "h": 23 - } - }, - { - "filename": "724s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 19, - "h": 25 - }, - "frame": { - "x": 191, - "y": 155, - "w": 19, - "h": 25 - } - }, - { - "filename": "766", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 193, - "y": 180, - "w": 24, - "h": 26 - } - }, - { - "filename": "801-original", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 80, - "y": 322, - "w": 20, - "h": 28 - } - }, - { - "filename": "801", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 80, - "y": 350, - "w": 20, - "h": 28 - } - }, - { - "filename": "801s-original", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 80, - "y": 378, - "w": 20, - "h": 28 - } - }, - { - "filename": "801s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 20, - "h": 28 - }, - "frame": { - "x": 80, - "y": 406, - "w": 20, - "h": 28 - } - }, - { - "filename": "766s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 24, - "h": 26 - }, - "frame": { - "x": 80, - "y": 434, - "w": 24, - "h": 26 - } - }, - { - "filename": "776", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 26 - }, - "frame": { - "x": 80, - "y": 460, - "w": 23, - "h": 26 - } - }, - { - "filename": "726", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 80, - "y": 486, - "w": 23, - "h": 24 - } - }, { "filename": "2089", "rotated": false, @@ -2502,12 +1956,33 @@ "h": 25 }, "frame": { - "x": 78, - "y": 510, + "x": 244, + "y": 57, "w": 26, "h": 25 } }, + { + "filename": "745-dusk", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 25 + }, + "frame": { + "x": 270, + "y": 57, + "w": 25, + "h": 25 + } + }, { "filename": "2089s", "rotated": false, @@ -2523,14 +1998,14 @@ "h": 25 }, "frame": { - "x": 78, - "y": 535, + "x": 295, + "y": 51, "w": 26, "h": 25 } }, { - "filename": "776s", + "filename": "745s-dusk", "rotated": false, "trimmed": true, "sourceSize": { @@ -2540,123 +2015,123 @@ "spriteSourceSize": { "x": 8, "y": 4, - "w": 23, - "h": 26 + "w": 25, + "h": 25 }, "frame": { - "x": 80, - "y": 560, - "w": 23, - "h": 26 - } - }, - { - "filename": "787", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 80, - "y": 586, - "w": 22, - "h": 26 - } - }, - { - "filename": "787s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 80, - "y": 612, - "w": 22, - "h": 26 - } - }, - { - "filename": "2075", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 29, - "h": 24 - }, - "frame": { - "x": 200, - "y": 27, - "w": 29, - "h": 24 - } - }, - { - "filename": "745-midnight", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 229, - "y": 30, - "w": 21, - "h": 24 - } - }, - { - "filename": "2075s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 29, - "h": 24 - }, - "frame": { - "x": 199, + "x": 321, "y": 51, - "w": 29, + "w": 25, + "h": 25 + } + }, + { + "filename": "766", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 26 + }, + "frame": { + "x": 346, + "y": 49, + "w": 24, + "h": 26 + } + }, + { + "filename": "766s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 24, + "h": 26 + }, + "frame": { + "x": 370, + "y": 49, + "w": 24, + "h": 26 + } + }, + { + "filename": "765", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 28, + "h": 21 + }, + "frame": { + "x": 457, + "y": 28, + "w": 28, + "h": 21 + } + }, + { + "filename": "760s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 17, + "h": 24 + }, + "frame": { + "x": 485, + "y": 28, + "w": 17, "h": 24 } }, { - "filename": "788", + "filename": "2103s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 21, + "h": 30 + }, + "frame": { + "x": 165, + "y": 86, + "w": 21, + "h": 30 + } + }, + { + "filename": "783", "rotated": false, "trimmed": true, "sourceSize": { @@ -2665,15 +2140,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 2, - "w": 22, - "h": 26 + "y": 3, + "w": 21, + "h": 27 }, "frame": { - "x": 228, - "y": 54, - "w": 22, - "h": 26 + "x": 165, + "y": 116, + "w": 21, + "h": 27 } }, { @@ -2691,8 +2166,8 @@ "h": 24 }, "frame": { - "x": 199, - "y": 75, + "x": 186, + "y": 82, "w": 25, "h": 24 } @@ -2712,12 +2187,33 @@ "h": 24 }, "frame": { - "x": 199, - "y": 99, + "x": 211, + "y": 82, "w": 25, "h": 24 } }, + { + "filename": "765s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 28, + "h": 21 + }, + "frame": { + "x": 186, + "y": 106, + "w": 28, + "h": 21 + } + }, { "filename": "2028", "rotated": false, @@ -2733,12 +2229,432 @@ "h": 24 }, "frame": { - "x": 224, - "y": 80, + "x": 236, + "y": 82, "w": 25, "h": 24 } }, + { + "filename": "2028s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 261, + "y": 82, + "w": 25, + "h": 24 + } + }, + { + "filename": "725", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 214, + "y": 106, + "w": 25, + "h": 21 + } + }, + { + "filename": "725s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 239, + "y": 106, + "w": 25, + "h": 21 + } + }, + { + "filename": "726", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 264, + "y": 106, + "w": 23, + "h": 24 + } + }, + { + "filename": "780", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 19 + }, + "frame": { + "x": 186, + "y": 127, + "w": 27, + "h": 19 + } + }, + { + "filename": "780s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 27, + "h": 19 + }, + "frame": { + "x": 213, + "y": 127, + "w": 27, + "h": 19 + } + }, + { + "filename": "758", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 240, + "y": 127, + "w": 24, + "h": 22 + } + }, + { + "filename": "726s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 264, + "y": 130, + "w": 23, + "h": 24 + } + }, + { + "filename": "727", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 286, + "y": 82, + "w": 23, + "h": 24 + } + }, + { + "filename": "776", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 26 + }, + "frame": { + "x": 287, + "y": 106, + "w": 23, + "h": 26 + } + }, + { + "filename": "727s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 287, + "y": 132, + "w": 23, + "h": 24 + } + }, + { + "filename": "776s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 23, + "h": 26 + }, + "frame": { + "x": 309, + "y": 76, + "w": 23, + "h": 26 + } + }, + { + "filename": "783s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 3, + "w": 21, + "h": 27 + }, + "frame": { + "x": 310, + "y": 102, + "w": 21, + "h": 27 + } + }, + { + "filename": "787", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 310, + "y": 129, + "w": 22, + "h": 26 + } + }, + { + "filename": "787s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 332, + "y": 76, + "w": 22, + "h": 26 + } + }, + { + "filename": "788", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 331, + "y": 102, + "w": 22, + "h": 26 + } + }, + { + "filename": "745", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 25, + "h": 23 + }, + "frame": { + "x": 354, + "y": 75, + "w": 25, + "h": 23 + } + }, + { + "filename": "788s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 22, + "h": 26 + }, + "frame": { + "x": 332, + "y": 128, + "w": 22, + "h": 26 + } + }, + { + "filename": "724", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 19, + "h": 25 + }, + "frame": { + "x": 379, + "y": 75, + "w": 19, + "h": 25 + } + }, + { + "filename": "724s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 19, + "h": 25 + }, + "frame": { + "x": 394, + "y": 49, + "w": 19, + "h": 25 + } + }, { "filename": "745s", "rotated": false, @@ -2754,8 +2670,8 @@ "h": 23 }, "frame": { - "x": 224, - "y": 104, + "x": 413, + "y": 48, "w": 25, "h": 23 } @@ -2775,327 +2691,12 @@ "h": 25 }, "frame": { - "x": 205, - "y": 123, + "x": 438, + "y": 48, "w": 19, "h": 25 } }, - { - "filename": "2020", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 224, - "y": 127, - "w": 25, - "h": 22 - } - }, - { - "filename": "765", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 28, - "h": 21 - }, - "frame": { - "x": 112, - "y": 205, - "w": 28, - "h": 21 - } - }, - { - "filename": "765s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 28, - "h": 21 - }, - "frame": { - "x": 140, - "y": 205, - "w": 28, - "h": 21 - } - }, - { - "filename": "2020s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 168, - "y": 205, - "w": 25, - "h": 22 - } - }, - { - "filename": "758", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 193, - "y": 206, - "w": 24, - "h": 22 - } - }, - { - "filename": "780", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 19 - }, - "frame": { - "x": 109, - "y": 226, - "w": 27, - "h": 19 - } - }, - { - "filename": "2028s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 108, - "y": 245, - "w": 25, - "h": 24 - } - }, - { - "filename": "788s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 108, - "y": 269, - "w": 22, - "h": 26 - } - }, - { - "filename": "803", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 108, - "y": 295, - "w": 23, - "h": 25 - } - }, - { - "filename": "780s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 27, - "h": 19 - }, - "frame": { - "x": 136, - "y": 226, - "w": 27, - "h": 19 - } - }, - { - "filename": "726s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 133, - "y": 245, - "w": 23, - "h": 24 - } - }, - { - "filename": "803s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 23, - "h": 25 - }, - "frame": { - "x": 130, - "y": 269, - "w": 23, - "h": 25 - } - }, - { - "filename": "806", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 3, - "w": 22, - "h": 25 - }, - "frame": { - "x": 131, - "y": 294, - "w": 22, - "h": 25 - } - }, - { - "filename": "727", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 100, - "y": 320, - "w": 23, - "h": 24 - } - }, - { - "filename": "727s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 100, - "y": 344, - "w": 23, - "h": 24 - } - }, { "filename": "729", "rotated": false, @@ -3111,14 +2712,14 @@ "h": 24 }, "frame": { - "x": 100, - "y": 368, + "x": 457, + "y": 49, "w": 23, "h": 24 } }, { - "filename": "729s", + "filename": "806", "rotated": false, "trimmed": true, "sourceSize": { @@ -3126,20 +2727,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 23, - "h": 24 + "x": 9, + "y": 3, + "w": 22, + "h": 25 }, "frame": { - "x": 100, - "y": 392, - "w": 23, - "h": 24 + "x": 480, + "y": 52, + "w": 22, + "h": 25 } }, { - "filename": "752", + "filename": "801-original", "rotated": false, "trimmed": true, "sourceSize": { @@ -3148,15 +2749,57 @@ }, "spriteSourceSize": { "x": 10, - "y": 8, - "w": 23, - "h": 18 + "y": 2, + "w": 20, + "h": 28 }, "frame": { - "x": 100, - "y": 416, + "x": 398, + "y": 74, + "w": 20, + "h": 28 + } + }, + { + "filename": "801", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 418, + "y": 71, + "w": 20, + "h": 28 + } + }, + { + "filename": "803", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, "w": 23, - "h": 18 + "h": 25 + }, + "frame": { + "x": 438, + "y": 73, + "w": 23, + "h": 25 } }, { @@ -3174,138 +2817,12 @@ "h": 25 }, "frame": { - "x": 104, - "y": 434, + "x": 461, + "y": 73, "w": 19, "h": 25 } }, - { - "filename": "758s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 163, - "y": 227, - "w": 24, - "h": 22 - } - }, - { - "filename": "768", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 187, - "y": 228, - "w": 24, - "h": 23 - } - }, - { - "filename": "768s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 156, - "y": 249, - "w": 24, - "h": 23 - } - }, - { - "filename": "770", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 153, - "y": 272, - "w": 23, - "h": 24 - } - }, - { - "filename": "770s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 153, - "y": 296, - "w": 23, - "h": 24 - } - }, - { - "filename": "2053", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 180, - "y": 251, - "w": 24, - "h": 22 - } - }, { "filename": "806s", "rotated": false, @@ -3321,14 +2838,14 @@ "h": 25 }, "frame": { - "x": 176, - "y": 273, + "x": 480, + "y": 77, "w": 22, "h": 25 } }, { - "filename": "756", + "filename": "734", "rotated": false, "trimmed": true, "sourceSize": { @@ -3337,19 +2854,124 @@ }, "spriteSourceSize": { "x": 9, + "y": 10, + "w": 25, + "h": 16 + }, + "frame": { + "x": 354, + "y": 98, + "w": 25, + "h": 16 + } + }, + { + "filename": "767", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 24, + "h": 14 + }, + "frame": { + "x": 353, + "y": 114, + "w": 24, + "h": 14 + } + }, + { + "filename": "803s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 23, + "h": 25 + }, + "frame": { + "x": 354, + "y": 128, + "w": 23, + "h": 25 + } + }, + { + "filename": "732", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 379, + "y": 100, + "w": 19, + "h": 22 + } + }, + { + "filename": "801s-original", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 2, + "w": 20, + "h": 28 + }, + "frame": { + "x": 377, + "y": 122, + "w": 20, + "h": 28 + } + }, + { + "filename": "729s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, "y": 5, - "w": 22, + "w": 23, "h": 24 }, "frame": { - "x": 176, - "y": 298, - "w": 22, + "x": 398, + "y": 102, + "w": 23, "h": 24 } }, { - "filename": "786", + "filename": "768", "rotated": false, "trimmed": true, "sourceSize": { @@ -3357,20 +2979,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 3, - "w": 20, - "h": 25 + "x": 8, + "y": 5, + "w": 24, + "h": 23 }, "frame": { - "x": 123, - "y": 320, - "w": 20, - "h": 25 + "x": 397, + "y": 126, + "w": 24, + "h": 23 } }, { - "filename": "786s", + "filename": "801s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3378,16 +3000,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 3, + "x": 10, + "y": 2, "w": 20, - "h": 25 + "h": 28 }, "frame": { - "x": 123, - "y": 345, + "x": 421, + "y": 99, "w": 20, - "h": 25 + "h": 28 + } + }, + { + "filename": "768s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 441, + "y": 98, + "w": 24, + "h": 23 } }, { @@ -3405,14 +3048,14 @@ "h": 24 }, "frame": { - "x": 123, - "y": 370, + "x": 421, + "y": 127, "w": 20, "h": 24 } }, { - "filename": "735s", + "filename": "770", "rotated": false, "trimmed": true, "sourceSize": { @@ -3420,20 +3063,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, + "x": 9, "y": 4, - "w": 20, + "w": 23, "h": 24 }, "frame": { - "x": 123, - "y": 394, - "w": 20, + "x": 441, + "y": 121, + "w": 23, "h": 24 } }, { - "filename": "745s-midnight", + "filename": "2050", "rotated": false, "trimmed": true, "sourceSize": { @@ -3441,15 +3084,120 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 465, + "y": 98, + "w": 15, + "h": 18 + } + }, + { + "filename": "756", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, "h": 24 }, "frame": { - "x": 123, - "y": 418, - "w": 21, + "x": 480, + "y": 102, + "w": 22, + "h": 24 + } + }, + { + "filename": "2050s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 465, + "y": 116, + "w": 15, + "h": 18 + } + }, + { + "filename": "756s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 24 + }, + "frame": { + "x": 480, + "y": 126, + "w": 22, + "h": 24 + } + }, + { + "filename": "761", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 464, + "y": 134, + "w": 16, + "h": 19 + } + }, + { + "filename": "802-zenith", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 4, + "w": 22, + "h": 24 + }, + "frame": { + "x": 480, + "y": 150, + "w": 22, "h": 24 } }, @@ -3468,14 +3216,14 @@ "h": 21 }, "frame": { - "x": 123, - "y": 442, + "x": 441, + "y": 145, "w": 23, "h": 21 } }, { - "filename": "2051", + "filename": "761s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3483,20 +3231,41 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, + "x": 13, + "y": 8, + "w": 16, + "h": 19 + }, + "frame": { + "x": 464, + "y": 153, + "w": 16, + "h": 19 + } + }, + { + "filename": "745-midnight", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 4, - "w": 23, + "w": 21, "h": 24 }, "frame": { - "x": 143, - "y": 320, - "w": 23, + "x": 165, + "y": 143, + "w": 21, "h": 24 } }, { - "filename": "2051s", + "filename": "2020", "rotated": false, "trimmed": true, "sourceSize": { @@ -3504,20 +3273,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 23, - "h": 24 + "x": 8, + "y": 6, + "w": 25, + "h": 22 }, "frame": { - "x": 143, - "y": 344, - "w": 23, - "h": 24 + "x": 186, + "y": 146, + "w": 25, + "h": 22 } }, { - "filename": "756s", + "filename": "2020s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3525,20 +3294,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 24 + "x": 8, + "y": 6, + "w": 25, + "h": 22 }, "frame": { - "x": 143, - "y": 368, - "w": 22, - "h": 24 + "x": 211, + "y": 146, + "w": 25, + "h": 22 } }, { - "filename": "802-zenith", + "filename": "802", "rotated": false, "trimmed": true, "sourceSize": { @@ -3552,54 +3321,12 @@ "h": 24 }, "frame": { - "x": 143, - "y": 392, + "x": 164, + "y": 167, "w": 22, "h": 24 } }, - { - "filename": "763", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 144, - "y": 416, - "w": 21, - "h": 24 - } - }, - { - "filename": "749", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 146, - "y": 440, - "w": 21, - "h": 23 - } - }, { "filename": "2105", "rotated": false, @@ -3615,8 +3342,8 @@ "h": 23 }, "frame": { - "x": 166, - "y": 322, + "x": 186, + "y": 168, "w": 24, "h": 23 } @@ -3636,14 +3363,14 @@ "h": 23 }, "frame": { - "x": 166, - "y": 345, + "x": 210, + "y": 168, "w": 24, "h": 23 } }, { - "filename": "802", + "filename": "734s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3651,18 +3378,186 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, + "x": 9, + "y": 10, + "w": 25, + "h": 16 + }, + "frame": { + "x": 164, + "y": 191, + "w": 25, + "h": 16 + } + }, + { + "filename": "770s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 4, - "w": 22, + "w": 23, "h": 24 }, "frame": { - "x": 165, - "y": 368, - "w": 22, + "x": 163, + "y": 207, + "w": 23, "h": 24 } }, + { + "filename": "2051", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 163, + "y": 231, + "w": 23, + "h": 24 + } + }, + { + "filename": "758s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 189, + "y": 191, + "w": 24, + "h": 22 + } + }, + { + "filename": "2051s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 186, + "y": 213, + "w": 23, + "h": 24 + } + }, + { + "filename": "745s-midnight", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 213, + "y": 191, + "w": 21, + "h": 24 + } + }, + { + "filename": "2053", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 209, + "y": 215, + "w": 24, + "h": 22 + } + }, + { + "filename": "2053s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 24, + "h": 22 + }, + "frame": { + "x": 186, + "y": 237, + "w": 24, + "h": 22 + } + }, + { + "filename": "769", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 210, + "y": 237, + "w": 23, + "h": 22 + } + }, { "filename": "802s-zenith", "rotated": false, @@ -3678,8 +3573,8 @@ "h": 24 }, "frame": { - "x": 165, - "y": 392, + "x": 187, + "y": 259, "w": 22, "h": 24 } @@ -3699,14 +3594,14 @@ "h": 24 }, "frame": { - "x": 165, - "y": 416, + "x": 209, + "y": 259, "w": 22, "h": 24 } }, { - "filename": "749s", + "filename": "746", "rotated": false, "trimmed": true, "sourceSize": { @@ -3714,83 +3609,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 167, - "y": 440, - "w": 21, - "h": 23 - } - }, - { - "filename": "755", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 13, - "h": 24 - }, - "frame": { - "x": 190, - "y": 322, - "w": 13, - "h": 24 - } - }, - { - "filename": "723", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 190, - "y": 346, - "w": 17, - "h": 22 - } - }, - { - "filename": "763s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 21, - "h": 24 + "x": 12, + "y": 11, + "w": 18, + "h": 13 }, "frame": { "x": 187, - "y": 368, - "w": 21, - "h": 24 + "y": 283, + "w": 18, + "h": 13 } }, { - "filename": "793", + "filename": "733s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3798,121 +3630,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 + "x": 8, + "y": 7, + "w": 23, + "h": 21 }, "frame": { - "x": 187, - "y": 392, - "w": 21, - "h": 24 - } - }, - { - "filename": "793s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 187, - "y": 416, - "w": 21, - "h": 24 - } - }, - { - "filename": "782", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 188, - "y": 440, - "w": 22, - "h": 23 - } - }, - { - "filename": "755s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 4, - "w": 13, - "h": 24 - }, - "frame": { - "x": 210, - "y": 148, - "w": 13, - "h": 24 - } - }, - { - "filename": "2053s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 24, - "h": 22 - }, - "frame": { - "x": 223, + "x": 236, "y": 149, - "w": 24, - "h": 22 - } - }, - { - "filename": "760s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 4, - "w": 17, - "h": 24 - }, - "frame": { - "x": 198, - "y": 273, - "w": 17, - "h": 24 + "w": 23, + "h": 21 } }, { @@ -3930,14 +3657,14 @@ "h": 24 }, "frame": { - "x": 198, - "y": 297, + "x": 234, + "y": 170, "w": 22, "h": 24 } }, { - "filename": "723s", + "filename": "738", "rotated": false, "trimmed": true, "sourceSize": { @@ -3945,16 +3672,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 22 + "x": 9, + "y": 6, + "w": 22, + "h": 21 }, "frame": { - "x": 204, - "y": 251, - "w": 17, - "h": 22 + "x": 234, + "y": 194, + "w": 22, + "h": 21 } }, { @@ -3972,14 +3699,14 @@ "h": 24 }, "frame": { - "x": 203, - "y": 321, + "x": 233, + "y": 215, "w": 22, "h": 24 } }, { - "filename": "762", + "filename": "738s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3987,20 +3714,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 18, - "h": 23 + "x": 9, + "y": 6, + "w": 22, + "h": 21 }, "frame": { - "x": 207, - "y": 345, - "w": 18, - "h": 23 + "x": 233, + "y": 239, + "w": 22, + "h": 21 } }, { - "filename": "741s-sensu", + "filename": "769s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4008,36 +3735,162 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 231, + "y": 260, + "w": 23, + "h": 22 + } + }, + { + "filename": "767s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 24, + "h": 14 + }, + "frame": { + "x": 205, + "y": 283, + "w": 24, + "h": 14 + } + }, + { + "filename": "763", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 195, + "y": 297, + "w": 21, + "h": 24 + } + }, + { + "filename": "735s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 216, + "y": 297, + "w": 20, + "h": 24 + } + }, + { + "filename": "752", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 18 + }, + "frame": { + "x": 259, + "y": 154, + "w": 23, + "h": 18 + } + }, + { + "filename": "763s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 21, + "h": 24 + }, + "frame": { + "x": 256, + "y": 172, + "w": 21, + "h": 24 + } + }, + { + "filename": "747", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 20 + }, + "frame": { + "x": 256, + "y": 196, + "w": 22, + "h": 20 + } + }, + { + "filename": "782", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 5, - "w": 17, + "w": 22, "h": 23 }, "frame": { - "x": 208, - "y": 368, - "w": 17, - "h": 23 - } - }, - { - "filename": "762s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 4, - "w": 18, - "h": 23 - }, - "frame": { - "x": 208, - "y": 391, - "w": 18, + "x": 255, + "y": 216, + "w": 22, "h": 23 } }, @@ -4056,14 +3909,14 @@ "h": 23 }, "frame": { - "x": 208, - "y": 414, + "x": 255, + "y": 239, "w": 22, "h": 23 } }, { - "filename": "2076", + "filename": "789", "rotated": false, "trimmed": true, "sourceSize": { @@ -4071,16 +3924,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 21, - "h": 23 + "x": 10, + "y": 6, + "w": 23, + "h": 20 }, "frame": { - "x": 210, - "y": 437, - "w": 21, - "h": 23 + "x": 254, + "y": 262, + "w": 23, + "h": 20 + } + }, + { + "filename": "752s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 23, + "h": 18 + }, + "frame": { + "x": 282, + "y": 156, + "w": 23, + "h": 18 } }, { @@ -4098,71 +3972,8 @@ "h": 22 }, "frame": { - "x": 230, - "y": 171, - "w": 20, - "h": 22 - } - }, - { - "filename": "743s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 20, - "h": 22 - }, - "frame": { - "x": 230, - "y": 193, - "w": 20, - "h": 22 - } - }, - { - "filename": "754", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 22 - }, - "frame": { - "x": 230, - "y": 215, - "w": 20, - "h": 22 - } - }, - { - "filename": "754s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 6, - "w": 20, - "h": 22 - }, - "frame": { - "x": 230, - "y": 237, + "x": 277, + "y": 174, "w": 20, "h": 22 } @@ -4182,12 +3993,54 @@ "h": 22 }, "frame": { - "x": 211, - "y": 228, + "x": 278, + "y": 196, "w": 19, "h": 22 } }, + { + "filename": "786", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 277, + "y": 218, + "w": 20, + "h": 25 + } + }, + { + "filename": "786s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 277, + "y": 243, + "w": 20, + "h": 25 + } + }, { "filename": "739", "rotated": false, @@ -4203,14 +4056,14 @@ "h": 21 }, "frame": { - "x": 230, - "y": 259, + "x": 277, + "y": 268, "w": 20, "h": 21 } }, { - "filename": "739s", + "filename": "755", "rotated": false, "trimmed": true, "sourceSize": { @@ -4218,20 +4071,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 20, - "h": 21 + "x": 14, + "y": 4, + "w": 13, + "h": 24 }, "frame": { - "x": 230, - "y": 280, - "w": 20, - "h": 21 + "x": 297, + "y": 174, + "w": 13, + "h": 24 } }, { - "filename": "2050", + "filename": "755s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4239,20 +4092,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 + "x": 14, + "y": 4, + "w": 13, + "h": 24 }, "frame": { - "x": 215, - "y": 273, - "w": 15, - "h": 18 + "x": 297, + "y": 198, + "w": 13, + "h": 24 } }, { - "filename": "744", + "filename": "793", "rotated": false, "trimmed": true, "sourceSize": { @@ -4260,20 +4113,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 + "x": 10, + "y": 4, + "w": 21, + "h": 24 }, "frame": { - "x": 231, - "y": 301, - "w": 19, - "h": 22 + "x": 297, + "y": 222, + "w": 21, + "h": 24 } }, { - "filename": "734s", + "filename": "793s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4281,20 +4134,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 25, - "h": 16 + "x": 10, + "y": 4, + "w": 21, + "h": 24 }, "frame": { - "x": 225, - "y": 323, - "w": 25, - "h": 16 + "x": 297, + "y": 246, + "w": 21, + "h": 24 } }, { - "filename": "769", + "filename": "747s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4302,37 +4155,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 + "x": 10, + "y": 7, + "w": 22, + "h": 20 }, "frame": { - "x": 225, - "y": 339, - "w": 23, - "h": 22 - } - }, - { - "filename": "769s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 225, - "y": 361, - "w": 23, - "h": 22 + "x": 297, + "y": 270, + "w": 22, + "h": 20 } }, { @@ -4350,12 +4182,516 @@ "h": 15 }, "frame": { - "x": 226, - "y": 383, + "x": 231, + "y": 282, "w": 24, "h": 15 } }, + { + "filename": "2037", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 255, + "y": 282, + "w": 22, + "h": 21 + } + }, + { + "filename": "744", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 236, + "y": 297, + "w": 19, + "h": 22 + } + }, + { + "filename": "743s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 20, + "h": 22 + }, + "frame": { + "x": 255, + "y": 303, + "w": 20, + "h": 22 + } + }, + { + "filename": "754", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 275, + "y": 303, + "w": 20, + "h": 22 + } + }, + { + "filename": "746s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 277, + "y": 290, + "w": 18, + "h": 13 + } + }, + { + "filename": "749", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 295, + "y": 290, + "w": 21, + "h": 23 + } + }, + { + "filename": "722", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 305, + "y": 156, + "w": 17, + "h": 18 + } + }, + { + "filename": "741-sensu", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 310, + "y": 174, + "w": 17, + "h": 23 + } + }, + { + "filename": "741s-sensu", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 310, + "y": 197, + "w": 17, + "h": 23 + } + }, + { + "filename": "737", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 18, + "h": 19 + }, + "frame": { + "x": 322, + "y": 155, + "w": 18, + "h": 19 + } + }, + { + "filename": "749s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 327, + "y": 174, + "w": 21, + "h": 23 + } + }, + { + "filename": "2076", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 327, + "y": 197, + "w": 21, + "h": 23 + } + }, + { + "filename": "2076s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 318, + "y": 220, + "w": 21, + "h": 23 + } + }, + { + "filename": "754s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 20, + "h": 22 + }, + "frame": { + "x": 318, + "y": 243, + "w": 20, + "h": 22 + } + }, + { + "filename": "728", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 340, + "y": 154, + "w": 17, + "h": 20 + } + }, + { + "filename": "739s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 357, + "y": 153, + "w": 20, + "h": 21 + } + }, + { + "filename": "789s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 348, + "y": 174, + "w": 23, + "h": 20 + } + }, + { + "filename": "2037s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 22, + "h": 21 + }, + "frame": { + "x": 348, + "y": 194, + "w": 22, + "h": 21 + } + }, + { + "filename": "744s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 19, + "h": 22 + }, + "frame": { + "x": 377, + "y": 150, + "w": 19, + "h": 22 + } + }, + { + "filename": "762", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 18, + "h": 23 + }, + "frame": { + "x": 319, + "y": 265, + "w": 18, + "h": 23 + } + }, + { + "filename": "762s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 4, + "w": 18, + "h": 23 + }, + "frame": { + "x": 339, + "y": 220, + "w": 18, + "h": 23 + } + }, + { + "filename": "741-pau", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 338, + "y": 243, + "w": 18, + "h": 22 + } + }, + { + "filename": "741s-pau", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 6, + "w": 18, + "h": 22 + }, + "frame": { + "x": 337, + "y": 265, + "w": 18, + "h": 22 + } + }, + { + "filename": "723", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 357, + "y": 215, + "w": 17, + "h": 22 + } + }, { "filename": "2074s", "rotated": false, @@ -4371,8 +4707,8 @@ "h": 15 }, "frame": { - "x": 226, - "y": 398, + "x": 397, + "y": 149, "w": 24, "h": 15 } @@ -4392,54 +4728,12 @@ "h": 20 }, "frame": { - "x": 230, - "y": 413, + "x": 421, + "y": 151, "w": 20, "h": 20 } }, - { - "filename": "744s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 19, - "h": 22 - }, - "frame": { - "x": 231, - "y": 433, - "w": 19, - "h": 22 - } - }, - { - "filename": "742", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 5, - "w": 19, - "h": 20 - }, - "frame": { - "x": 231, - "y": 455, - "w": 19, - "h": 20 - } - }, { "filename": "775", "rotated": false, @@ -4455,14 +4749,14 @@ "h": 20 }, "frame": { - "x": 210, - "y": 460, + "x": 396, + "y": 164, "w": 21, "h": 20 } }, { - "filename": "742s", + "filename": "742", "rotated": false, "trimmed": true, "sourceSize": { @@ -4476,180 +4770,12 @@ "h": 20 }, "frame": { - "x": 231, - "y": 475, + "x": 377, + "y": 172, "w": 19, "h": 20 } }, - { - "filename": "733s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 23, - "h": 21 - }, - "frame": { - "x": 103, - "y": 463, - "w": 23, - "h": 21 - } - }, - { - "filename": "2076s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 103, - "y": 484, - "w": 21, - "h": 23 - } - }, - { - "filename": "738", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 126, - "y": 463, - "w": 22, - "h": 21 - } - }, - { - "filename": "738s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 124, - "y": 484, - "w": 22, - "h": 21 - } - }, - { - "filename": "2037", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 148, - "y": 463, - "w": 22, - "h": 21 - } - }, - { - "filename": "2037s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 21 - }, - "frame": { - "x": 146, - "y": 484, - "w": 22, - "h": 21 - } - }, - { - "filename": "747s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 22, - "h": 20 - }, - "frame": { - "x": 170, - "y": 463, - "w": 22, - "h": 20 - } - }, - { - "filename": "741-pau", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 6, - "w": 18, - "h": 22 - }, - "frame": { - "x": 192, - "y": 463, - "w": 18, - "h": 22 - } - }, { "filename": "775s", "rotated": false, @@ -4665,495 +4791,12 @@ "h": 20 }, "frame": { - "x": 210, - "y": 480, + "x": 417, + "y": 171, "w": 21, "h": 20 } }, - { - "filename": "757", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 19, - "h": 18 - }, - "frame": { - "x": 231, - "y": 495, - "w": 19, - "h": 18 - } - }, - { - "filename": "2019", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 21 - }, - "frame": { - "x": 104, - "y": 507, - "w": 21, - "h": 21 - } - }, - { - "filename": "2019s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 21, - "h": 21 - }, - "frame": { - "x": 104, - "y": 528, - "w": 21, - "h": 21 - } - }, - { - "filename": "2052", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 125, - "y": 505, - "w": 21, - "h": 21 - } - }, - { - "filename": "2052s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 125, - "y": 526, - "w": 21, - "h": 21 - } - }, - { - "filename": "779", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 146, - "y": 505, - "w": 21, - "h": 20 - } - }, - { - "filename": "779s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 20 - }, - "frame": { - "x": 146, - "y": 525, - "w": 21, - "h": 20 - } - }, - { - "filename": "752s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 23, - "h": 18 - }, - "frame": { - "x": 104, - "y": 549, - "w": 23, - "h": 18 - } - }, - { - "filename": "790", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 19 - }, - "frame": { - "x": 103, - "y": 567, - "w": 21, - "h": 19 - } - }, - { - "filename": "741s-pau", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 6, - "w": 18, - "h": 22 - }, - "frame": { - "x": 102, - "y": 586, - "w": 18, - "h": 22 - } - }, - { - "filename": "731", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 102, - "y": 608, - "w": 17, - "h": 22 - } - }, - { - "filename": "741s-pompom", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 20 - }, - "frame": { - "x": 127, - "y": 547, - "w": 20, - "h": 20 - } - }, - { - "filename": "790s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 21, - "h": 19 - }, - "frame": { - "x": 124, - "y": 567, - "w": 21, - "h": 19 - } - }, - { - "filename": "731s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 120, - "y": 586, - "w": 17, - "h": 22 - } - }, - { - "filename": "778-disguised", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 119, - "y": 608, - "w": 17, - "h": 22 - } - }, - { - "filename": "778s-disguised", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 147, - "y": 545, - "w": 17, - "h": 22 - } - }, - { - "filename": "737", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 18, - "h": 19 - }, - "frame": { - "x": 145, - "y": 567, - "w": 18, - "h": 19 - } - }, - { - "filename": "2027", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 137, - "y": 586, - "w": 21, - "h": 18 - } - }, - { - "filename": "767", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 24, - "h": 14 - }, - "frame": { - "x": 102, - "y": 630, - "w": 24, - "h": 14 - } - }, - { - "filename": "2027s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 10, - "w": 21, - "h": 18 - }, - "frame": { - "x": 96, - "y": 644, - "w": 21, - "h": 18 - } - }, - { - "filename": "722", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 117, - "y": 644, - "w": 17, - "h": 18 - } - }, - { - "filename": "767s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 24, - "h": 14 - }, - "frame": { - "x": 126, - "y": 630, - "w": 24, - "h": 14 - } - }, - { - "filename": "722s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 17, - "h": 18 - }, - "frame": { - "x": 134, - "y": 644, - "w": 17, - "h": 18 - } - }, { "filename": "778-busted", "rotated": false, @@ -5169,14 +4812,14 @@ "h": 16 }, "frame": { - "x": 137, - "y": 604, + "x": 396, + "y": 184, "w": 21, "h": 16 } }, { - "filename": "728", + "filename": "778s-busted", "rotated": false, "trimmed": true, "sourceSize": { @@ -5184,18 +4827,60 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, + "x": 9, + "y": 12, + "w": 21, + "h": 16 + }, + "frame": { + "x": 417, + "y": 191, + "w": 21, + "h": 16 + } + }, + { + "filename": "779", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, "h": 20 }, "frame": { - "x": 158, - "y": 586, - "w": 17, + "x": 441, + "y": 166, + "w": 21, "h": 20 } }, + { + "filename": "2019", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 21 + }, + "frame": { + "x": 438, + "y": 186, + "w": 21, + "h": 21 + } + }, { "filename": "737s", "rotated": false, @@ -5211,14 +4896,14 @@ "h": 19 }, "frame": { - "x": 163, - "y": 567, + "x": 462, + "y": 172, "w": 18, "h": 19 } }, { - "filename": "728s", + "filename": "779s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5226,15 +4911,225 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, + "x": 10, + "y": 7, + "w": 21, "h": 20 }, "frame": { - "x": 158, - "y": 606, + "x": 480, + "y": 174, + "w": 21, + "h": 20 + } + }, + { + "filename": "790", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 459, + "y": 191, + "w": 21, + "h": 19 + } + }, + { + "filename": "790s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 21, + "h": 19 + }, + "frame": { + "x": 480, + "y": 194, + "w": 21, + "h": 19 + } + }, + { + "filename": "2019s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 21, + "h": 21 + }, + "frame": { + "x": 370, + "y": 194, + "w": 21, + "h": 21 + } + }, + { + "filename": "723s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, "w": 17, + "h": 22 + }, + "frame": { + "x": 374, + "y": 215, + "w": 17, + "h": 22 + } + }, + { + "filename": "2052", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 391, + "y": 200, + "w": 21, + "h": 21 + } + }, + { + "filename": "2027", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 391, + "y": 221, + "w": 21, + "h": 18 + } + }, + { + "filename": "2052s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 412, + "y": 207, + "w": 21, + "h": 21 + } + }, + { + "filename": "741s-pompom", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 20 + }, + "frame": { + "x": 433, + "y": 207, + "w": 20, + "h": 20 + } + }, + { + "filename": "2027s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 10, + "w": 21, + "h": 18 + }, + "frame": { + "x": 412, + "y": 228, + "w": 21, + "h": 18 + } + }, + { + "filename": "742s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 5, + "w": 19, + "h": 20 + }, + "frame": { + "x": 433, + "y": 227, + "w": 19, "h": 20 } }, @@ -5253,8 +5148,8 @@ "h": 18 }, "frame": { - "x": 150, - "y": 626, + "x": 453, + "y": 210, "w": 21, "h": 18 } @@ -5274,14 +5169,14 @@ "h": 18 }, "frame": { - "x": 151, - "y": 644, + "x": 452, + "y": 228, "w": 21, "h": 18 } }, { - "filename": "751", + "filename": "757", "rotated": false, "trimmed": true, "sourceSize": { @@ -5289,37 +5184,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 + "x": 11, + "y": 9, + "w": 19, + "h": 18 }, "frame": { - "x": 175, - "y": 586, - "w": 14, - "h": 20 - } - }, - { - "filename": "751s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 14, - "h": 20 - }, - "frame": { - "x": 175, - "y": 606, - "w": 14, - "h": 20 + "x": 474, + "y": 213, + "w": 19, + "h": 18 } }, { @@ -5337,12 +5211,138 @@ "h": 18 }, "frame": { - "x": 171, - "y": 626, + "x": 473, + "y": 231, "w": 19, "h": 18 } }, + { + "filename": "731", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 316, + "y": 290, + "w": 17, + "h": 22 + } + }, + { + "filename": "771", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 316, + "y": 312, + "w": 18, + "h": 13 + } + }, + { + "filename": "731s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 333, + "y": 288, + "w": 17, + "h": 22 + } + }, + { + "filename": "736", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 17, + "h": 13 + }, + "frame": { + "x": 334, + "y": 310, + "w": 17, + "h": 13 + } + }, + { + "filename": "778-disguised", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 350, + "y": 287, + "w": 17, + "h": 22 + } + }, + { + "filename": "778s-disguised", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 355, + "y": 265, + "w": 17, + "h": 22 + } + }, { "filename": "741", "rotated": false, @@ -5358,14 +5358,14 @@ "h": 19 }, "frame": { - "x": 172, - "y": 644, + "x": 356, + "y": 246, "w": 17, "h": 19 } }, { - "filename": "778s-busted", + "filename": "728s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5373,16 +5373,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 12, - "w": 21, - "h": 16 + "x": 13, + "y": 8, + "w": 17, + "h": 20 }, "frame": { - "x": 189, - "y": 485, - "w": 21, - "h": 16 + "x": 373, + "y": 237, + "w": 17, + "h": 20 + } + }, + { + "filename": "722s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 17, + "h": 18 + }, + "frame": { + "x": 390, + "y": 239, + "w": 17, + "h": 18 + } + }, + { + "filename": "736s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 17, + "h": 13 + }, + "frame": { + "x": 351, + "y": 309, + "w": 17, + "h": 13 + } + }, + { + "filename": "771s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 11, + "w": 18, + "h": 13 + }, + "frame": { + "x": 373, + "y": 257, + "w": 18, + "h": 13 } }, { @@ -5400,54 +5463,12 @@ "h": 19 }, "frame": { - "x": 164, - "y": 545, + "x": 372, + "y": 270, "w": 17, "h": 19 } }, - { - "filename": "753", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 14, - "h": 19 - }, - "frame": { - "x": 168, - "y": 484, - "w": 14, - "h": 19 - } - }, - { - "filename": "753s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 8, - "w": 14, - "h": 19 - }, - "frame": { - "x": 189, - "y": 644, - "w": 14, - "h": 19 - } - }, { "filename": "759", "rotated": false, @@ -5463,12 +5484,33 @@ "h": 19 }, "frame": { - "x": 167, - "y": 505, + "x": 367, + "y": 289, "w": 17, "h": 19 } }, + { + "filename": "808", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 368, + "y": 308, + "w": 17, + "h": 17 + } + }, { "filename": "759s", "rotated": false, @@ -5484,117 +5526,12 @@ "h": 19 }, "frame": { - "x": 167, - "y": 524, + "x": 391, + "y": 257, "w": 17, "h": 19 } }, - { - "filename": "777", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 19 - }, - "frame": { - "x": 184, - "y": 501, - "w": 17, - "h": 19 - } - }, - { - "filename": "777s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 17, - "h": 19 - }, - "frame": { - "x": 184, - "y": 520, - "w": 17, - "h": 19 - } - }, - { - "filename": "761", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 19 - }, - "frame": { - "x": 201, - "y": 501, - "w": 16, - "h": 19 - } - }, - { - "filename": "761s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 8, - "w": 16, - "h": 19 - }, - "frame": { - "x": 201, - "y": 520, - "w": 16, - "h": 19 - } - }, - { - "filename": "746", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 184, - "y": 539, - "w": 18, - "h": 13 - } - }, { "filename": "774-blue", "rotated": false, @@ -5610,14 +5547,14 @@ "h": 18 }, "frame": { - "x": 181, - "y": 552, + "x": 389, + "y": 276, "w": 17, "h": 18 } }, { - "filename": "736", + "filename": "777", "rotated": false, "trimmed": true, "sourceSize": { @@ -5625,37 +5562,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 12, + "x": 13, + "y": 8, "w": 17, - "h": 13 + "h": 19 }, "frame": { - "x": 181, - "y": 570, + "x": 408, + "y": 246, "w": 17, - "h": 13 - } - }, - { - "filename": "736s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 17, - "h": 13 - }, - "frame": { - "x": 202, - "y": 539, - "w": 17, - "h": 13 + "h": 19 } }, { @@ -5673,14 +5589,14 @@ "h": 18 }, "frame": { - "x": 198, - "y": 552, + "x": 408, + "y": 265, "w": 17, "h": 18 } }, { - "filename": "746s", + "filename": "777s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5688,16 +5604,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 18, - "h": 13 + "x": 13, + "y": 8, + "w": 17, + "h": 19 }, "frame": { - "x": 198, - "y": 570, - "w": 18, - "h": 13 + "x": 425, + "y": 247, + "w": 17, + "h": 19 } }, { @@ -5715,12 +5631,33 @@ "h": 18 }, "frame": { - "x": 189, - "y": 583, + "x": 425, + "y": 266, "w": 17, "h": 18 } }, + { + "filename": "751", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 442, + "y": 247, + "w": 14, + "h": 20 + } + }, { "filename": "774-orange", "rotated": false, @@ -5736,8 +5673,8 @@ "h": 18 }, "frame": { - "x": 189, - "y": 601, + "x": 456, + "y": 246, "w": 17, "h": 18 } @@ -5757,12 +5694,33 @@ "h": 18 }, "frame": { - "x": 206, - "y": 583, + "x": 473, + "y": 249, "w": 17, "h": 18 } }, + { + "filename": "751s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 14, + "h": 20 + }, + "frame": { + "x": 442, + "y": 267, + "w": 14, + "h": 20 + } + }, { "filename": "774-violet", "rotated": false, @@ -5778,8 +5736,8 @@ "h": 18 }, "frame": { - "x": 206, - "y": 601, + "x": 456, + "y": 264, "w": 17, "h": 18 } @@ -5799,8 +5757,8 @@ "h": 18 }, "frame": { - "x": 190, - "y": 619, + "x": 473, + "y": 267, "w": 17, "h": 18 } @@ -5820,8 +5778,8 @@ "h": 18 }, "frame": { - "x": 207, - "y": 619, + "x": 406, + "y": 283, "w": 17, "h": 18 } @@ -5841,33 +5799,12 @@ "h": 18 }, "frame": { - "x": 203, - "y": 637, + "x": 423, + "y": 284, "w": 17, "h": 18 } }, - { - "filename": "808", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 203, - "y": 655, - "w": 17, - "h": 17 - } - }, { "filename": "774s-green", "rotated": false, @@ -5883,14 +5820,14 @@ "h": 18 }, "frame": { - "x": 215, - "y": 552, + "x": 440, + "y": 287, "w": 17, "h": 18 } }, { - "filename": "771", + "filename": "753", "rotated": false, "trimmed": true, "sourceSize": { @@ -5898,58 +5835,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 11, - "w": 18, - "h": 13 + "x": 14, + "y": 8, + "w": 14, + "h": 19 }, "frame": { - "x": 216, - "y": 570, - "w": 18, - "h": 13 - } - }, - { - "filename": "771s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 11, - "w": 18, - "h": 13 - }, - "frame": { - "x": 232, - "y": 513, - "w": 18, - "h": 13 - } - }, - { - "filename": "2050s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 217, - "y": 513, - "w": 15, - "h": 18 + "x": 457, + "y": 282, + "w": 14, + "h": 19 } }, { @@ -5967,12 +5862,33 @@ "h": 18 }, "frame": { - "x": 223, - "y": 583, + "x": 471, + "y": 285, "w": 17, "h": 18 } }, + { + "filename": "753s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 8, + "w": 14, + "h": 19 + }, + "frame": { + "x": 488, + "y": 285, + "w": 14, + "h": 19 + } + }, { "filename": "774s-orange", "rotated": false, @@ -5988,8 +5904,8 @@ "h": 18 }, "frame": { - "x": 223, - "y": 601, + "x": 385, + "y": 294, "w": 17, "h": 18 } @@ -6009,8 +5925,8 @@ "h": 18 }, "frame": { - "x": 224, - "y": 619, + "x": 402, + "y": 301, "w": 17, "h": 18 } @@ -6030,33 +5946,12 @@ "h": 18 }, "frame": { - "x": 220, - "y": 637, + "x": 419, + "y": 302, "w": 17, "h": 18 } }, - { - "filename": "808s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 17, - "h": 17 - }, - "frame": { - "x": 220, - "y": 655, - "w": 17, - "h": 17 - } - }, { "filename": "774s-yellow", "rotated": false, @@ -6072,8 +5967,8 @@ "h": 18 }, "frame": { - "x": 219, - "y": 531, + "x": 436, + "y": 305, "w": 17, "h": 18 } @@ -6093,11 +5988,32 @@ "h": 18 }, "frame": { - "x": 232, - "y": 549, + "x": 453, + "y": 305, "w": 17, "h": 18 } + }, + { + "filename": "808s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 17, + "h": 17 + }, + "frame": { + "x": 470, + "y": 303, + "w": 17, + "h": 17 + } } ] } @@ -6105,6 +6021,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:be37a6c6f866e26c7e4deba1514c5a68:cb56f7bd9b13cc1604b5814449582c05:2e7c5873ead8fd8fce82a0b3fcc86b42$" + "smartupdate": "$TexturePacker:SmartUpdate:5861cb99c3db0943f1ccef3b0e1b4683:26656a692718930d92be5b6aba391ced:2e7c5873ead8fd8fce82a0b3fcc86b42$" } } diff --git a/public/images/pokemon_icons_7.png b/public/images/pokemon_icons_7.png index 8c8311b1d0b..5e6421360fd 100644 Binary files a/public/images/pokemon_icons_7.png and b/public/images/pokemon_icons_7.png differ diff --git a/src/data/balance/signature-species.ts b/src/data/balance/signature-species.ts new file mode 100644 index 00000000000..a1b73af40cd --- /dev/null +++ b/src/data/balance/signature-species.ts @@ -0,0 +1,162 @@ +import { Species } from "#enums/species"; + +export type SignatureSpecies = { + [key in string]: (Species | Species[])[]; +}; + +/* + * The signature species for each Gym Leader, Elite Four member, and Champion. + * The key is the trainer type, and the value is an array of Species or Species arrays. + * This is in a separate const so it can be accessed from other places and not just the trainerConfigs + */ +export const signatureSpecies: SignatureSpecies = { + // Gym Leaders- Kanto + BROCK: [Species.GEODUDE, Species.ONIX], + MISTY: [Species.STARYU, Species.PSYDUCK], + LT_SURGE: [Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ], + ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP], + JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT], + SABRINA: [Species.ABRA, Species.MR_MIME, Species.ESPEON], + BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGMAR], + GIOVANNI: [Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F], + // Gym Leaders- Johto + FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.DODUO], + BUGSY: [Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR], + WHITNEY: [Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG], + MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE], + CHUCK: [Species.POLIWRATH, Species.MANKEY], + JASMINE: [Species.MAGNEMITE, Species.STEELIX], + PRYCE: [Species.SEEL, Species.SWINUB], + CLAIR: [Species.DRATINI, Species.HORSEA, Species.GYARADOS], + // Gym Leaders- Hoenn + ROXANNE: [Species.GEODUDE, Species.NOSEPASS], + BRAWLY: [Species.MACHOP, Species.MAKUHITA], + WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE], + FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL], + NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON], + WINONA: [Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY], + TATE: [Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE], + LIZA: [Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR], + JUAN: [Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.RELICANTH], + // Gym Leaders- Sinnoh + ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE], + GARDENIA: [Species.ROSELIA, Species.TANGELA, Species.TURTWIG], + MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR], + CRASHER_WAKE: [Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP], + FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB], + BYRON: [Species.SHIELDON, Species.BRONZOR, Species.AGGRON], + CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT], + VOLKNER: [Species.SHINX, Species.CHINCHOU, Species.ROTOM], + // Gym Leaders- Unova + CILAN: [Species.PANSAGE, Species.FOONGUS, Species.PETILIL], + CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.NUMEL], + CRESS: [Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE], + CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE], + LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO], + ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI], + BURGH: [Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST], + ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK], + CLAY: [Species.DRILBUR, Species.SANDILE, Species.GOLETT], + SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET], + BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO], + DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO], + MARLON: [Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA], + // Gym Leaders- Kalos + VIOLA: [Species.SURSKIT, Species.SCATTERBUG], + GRANT: [Species.AMAURA, Species.TYRUNT], + KORRINA: [Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO], + RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT], + CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA], + VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME], + OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING], + WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL], + // Gym Leaders- Galar + MILO: [Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET], + NESSA: [Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD], + KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL], + BEA: [Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS], + ALLISTER: [Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY], + OPAL: [Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING], + BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR], + GORDIE: [Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE], + MELONY: [Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME], + PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY], + MARNIE: [Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO], + RAIHAN: [Species.DURALUDON, Species.TURTONATOR, Species.GOOMY], + // Gym Leaders- Paldea; First slot is Tera + KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA], // Tera Bug Teddiursa + BRASSIUS: [Species.SUDOWOODO, Species.BRAMBLIN, Species.SMOLIV], // Tera Grass Sudowoodo + IONO: [Species.MISDREAVUS, Species.TADBULB, Species.WATTREL], // Tera Ghost Misdreavus + KOFU: [Species.CRABRAWLER, Species.VELUZA, Species.WIGLETT, Species.WINGULL], // Tera Water Crabrawler + LARRY: [Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA], // Tera Normal Starly + RYME: [Species.TOXEL, Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], // Tera Ghost Toxel + TULIP: [Species.FLABEBE, Species.FLITTLE, Species.RALTS, Species.GIRAFARIG], // Tera Psychic Flabebe + GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.CUBCHOO, Species.ALOLA_VULPIX], // Tera Ice Swablu + + // Elite Four- Kanto + LORELEI: [ + Species.JYNX, + [Species.SLOWBRO, Species.GALAR_SLOWBRO], + Species.LAPRAS, + [Species.CLOYSTER, Species.ALOLA_SANDSLASH], + ], + BRUNO: [Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [Species.GOLEM, Species.ALOLA_GOLEM]], + AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK], + LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR], + // Elite Four- Johto (Bruno included) + WILL: [Species.XATU, Species.JYNX, [Species.SLOWBRO, Species.SLOWKING], Species.EXEGGUTOR], + KOGA: [[Species.MUK, Species.WEEZING], [Species.VENOMOTH, Species.ARIADOS], Species.CROBAT, Species.TENTACRUEL], + KAREN: [Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE], + // Elite Four- Hoenn + SIDNEY: [ + [Species.SHIFTRY, Species.CACTURNE], + [Species.SHARPEDO, Species.CRAWDAUNT], + Species.ABSOL, + Species.MIGHTYENA, + ], + PHOEBE: [Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [Species.DRIFBLIM, Species.MISMAGIUS]], + GLACIA: [Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW], + DRAKE: [Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA], + // Elite Four- Sinnoh + AARON: [[Species.SCIZOR, Species.KLEAVOR], Species.HERACROSS, [Species.VESPIQUEN, Species.YANMEGA], Species.DRAPION], + BERTHA: [Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR], + FLINT: [ + [Species.RAPIDASH, Species.FLAREON], + Species.MAGMORTAR, + [Species.STEELIX, Species.LOPUNNY], + Species.INFERNAPE, + ], // Tera Fire Steelix or Lopunny + LUCIAN: [Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [Species.ALAKAZAM, Species.ESPEON]], + // Elite Four- Unova + SHAUNTAL: [Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT], + MARSHAL: [Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK], + GRIMSLEY: [Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE], + CAITLIN: [Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS], + // Elite Four- Kalos + MALVA: [Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME], + SIEBOLD: [Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE], + WIKSTROM: [Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH], + DRASNA: [Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN], + // Elite Four- Alola + HALA: [Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [Species.POLIWRATH, Species.ANNIHILAPE]], + MOLAYNE: [Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO], + OLIVIA: [Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC], + ACEROLA: [[Species.BANETTE, Species.DRIFBLIM], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND], + KAHILI: [[Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON], + // Elite Four- Galar + MARNIE_ELITE: [Species.MORPEKO, Species.LIEPARD, [Species.TOXICROAK, Species.SCRAFTY], Species.GRIMMSNARL], + NESSA_ELITE: [Species.GOLISOPOD, [Species.QUAGSIRE, Species.PELIPPER], Species.TOXAPEX, Species.DREDNAW], + BEA_ELITE: [Species.HAWLUCHA, [Species.GRAPPLOCT, Species.SIRFETCHD], Species.FALINKS, Species.MACHAMP], + ALLISTER_ELITE: [Species.DUSKNOIR, [Species.POLTEAGEIST, Species.RUNERIGUS], Species.CURSOLA, Species.GENGAR], + RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON], + // Elite Four- Paldea + RIKA: [Species.CLODSIRE, [Species.DUGTRIO, Species.DONPHAN], Species.CAMERUPT, Species.WHISCASH], // Tera Ground Clodsire + POPPY: [Species.TINKATON, Species.BRONZONG, Species.CORVIKNIGHT, Species.COPPERAJAH], // Tera Steel Tinkaton + LARRY_ELITE: [Species.FLAMIGO, Species.STARAPTOR, [Species.ALTARIA, Species.TROPIUS], Species.ORICORIO], // Tera Flying Flamigo; random Oricorio + HASSEL: [Species.BAXCALIBUR, [Species.FLAPPLE, Species.APPLETUN], Species.DRAGALGE, Species.NOIVERN], // Tera Dragon Baxcalibur + // Elite Four- BBL + CRISPIN: [Species.BLAZIKEN, Species.MAGMORTAR, [Species.CAMERUPT, Species.TALONFLAME], Species.ROTOM], // Tera Fire Blaziken; Heat Rotom + AMARYS: [Species.METAGROSS, Species.SCIZOR, Species.EMPOLEON, Species.SKARMORY], // Tera Steel Metagross + LACEY: [Species.EXCADRILL, Species.PRIMARINA, [Species.WHIMSICOTT, Species.ALCREMIE], Species.GRANBULL], // Tera Fairy Excadrill + DRAYTON: [Species.ARCHALUDON, Species.DRAGONITE, Species.HAXORUS, Species.SCEPTILE], // Tera Dragon Archaludon +}; diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index 1a3e463de3f..4636e68d6d6 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -912,24 +912,12 @@ export const pokemonFormChanges: PokemonFormChanges = { new SpeciesFormChange(Species.MIMIKYU, "disguised", "busted", new SpeciesFormChangeAbilityTrigger(), true), new SpeciesFormChange(Species.MIMIKYU, "busted", "disguised", new SpeciesFormChangeAbilityTrigger(), true) ], - [Species.SOLGALEO]: [ - new SpeciesFormChange(Species.SOLGALEO, "", "radiant-sun", new SpeciesFormChangePreMoveTrigger(Moves.SUNSTEEL_STRIKE), true), - new SpeciesFormChange(Species.SOLGALEO, "radiant-sun", "", new SpeciesFormChangeActiveTrigger(false), true) - ], - [Species.LUNALA]: [ - new SpeciesFormChange(Species.LUNALA, "", "full-moon", new SpeciesFormChangePreMoveTrigger(Moves.MOONGEIST_BEAM), true), - new SpeciesFormChange(Species.LUNALA, "full-moon", "", new SpeciesFormChangeActiveTrigger(false), true) - ], [Species.NECROZMA]: [ new SpeciesFormChange(Species.NECROZMA, "", "dawn-wings", new SpeciesFormChangeItemTrigger(FormChangeItem.N_LUNARIZER), false, getSpeciesDependentFormChangeCondition(Species.LUNALA)), new SpeciesFormChange(Species.NECROZMA, "", "dusk-mane", new SpeciesFormChangeItemTrigger(FormChangeItem.N_SOLARIZER), false, getSpeciesDependentFormChangeCondition(Species.SOLGALEO)), new SpeciesFormChange(Species.NECROZMA, "dawn-wings", "ultra", new SpeciesFormChangeItemTrigger(FormChangeItem.ULTRANECROZIUM_Z)), new SpeciesFormChange(Species.NECROZMA, "dusk-mane", "ultra", new SpeciesFormChangeItemTrigger(FormChangeItem.ULTRANECROZIUM_Z)) ], - [Species.MARSHADOW]: [ - new SpeciesFormChange(Species.MARSHADOW, "", "zenith", new SpeciesFormChangePreMoveTrigger(Moves.SPECTRAL_THIEF), true), - new SpeciesFormChange(Species.MARSHADOW, "zenith", "", new SpeciesFormChangeActiveTrigger(false), true) - ], [Species.MELMETAL]: [ new SpeciesFormChange(Species.MELMETAL, "", SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)) ], diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index fee2bc5c9da..1bf97209613 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -63,8 +63,6 @@ export const normalForm: Species[] = [ Species.FROGADIER, Species.GRENINJA, Species.ROCKRUFF, - Species.SOLGALEO, - Species.LUNALA, Species.NECROZMA, Species.MAGEARNA, Species.MARSHADOW, @@ -2678,14 +2676,8 @@ export function initSpecies() { new PokemonSpecies(Species.TAPU_FINI, 7, true, false, false, "Land Spirit Pokémon", PokemonType.WATER, PokemonType.FAIRY, 1.3, 21.2, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.TELEPATHY, 570, 70, 75, 115, 95, 130, 85, 3, 50, 285, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.COSMOG, 7, true, false, false, "Nebula Pokémon", PokemonType.PSYCHIC, null, 0.2, 0.1, Abilities.UNAWARE, Abilities.NONE, Abilities.NONE, 200, 43, 29, 31, 29, 31, 37, 45, 0, 40, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.COSMOEM, 7, true, false, false, "Protostar Pokémon", PokemonType.PSYCHIC, null, 0.1, 999.9, Abilities.STURDY, Abilities.NONE, Abilities.NONE, 400, 43, 29, 131, 29, 131, 37, 45, 0, 140, GrowthRate.SLOW, null, false), - new PokemonSpecies(Species.SOLGALEO, 7, false, true, false, "Sunne Pokémon", PokemonType.PSYCHIC, PokemonType.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, false, null, true), - new PokemonForm("Radiant Sun", "radiant-sun", PokemonType.PSYCHIC, PokemonType.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340), - ), - new PokemonSpecies(Species.LUNALA, 7, false, true, false, "Moone Pokémon", PokemonType.PSYCHIC, PokemonType.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, GrowthRate.SLOW, null, false, true, - new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, false, null, true), - new PokemonForm("Full Moon", "full-moon", PokemonType.PSYCHIC, PokemonType.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340), - ), + new PokemonSpecies(Species.SOLGALEO, 7, false, true, false, "Sunne Pokémon", PokemonType.PSYCHIC, PokemonType.STEEL, 3.4, 230, Abilities.FULL_METAL_BODY, Abilities.NONE, Abilities.NONE, 680, 137, 137, 107, 113, 89, 97, 45, 0, 340, GrowthRate.SLOW, null, false), + new PokemonSpecies(Species.LUNALA, 7, false, true, false, "Moone Pokémon", PokemonType.PSYCHIC, PokemonType.GHOST, 4, 120, Abilities.SHADOW_SHIELD, Abilities.NONE, Abilities.NONE, 680, 137, 113, 89, 137, 107, 97, 45, 0, 340, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.NIHILEGO, 7, true, false, false, "Parasite Pokémon", PokemonType.ROCK, PokemonType.POISON, 1.2, 55.5, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 109, 53, 47, 127, 131, 103, 45, 0, 285, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.BUZZWOLE, 7, true, false, false, "Swollen Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 2.4, 333.6, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 107, 139, 139, 53, 53, 79, 45, 0, 285, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.PHEROMOSA, 7, true, false, false, "Lissome Pokémon", PokemonType.BUG, PokemonType.FIGHTING, 1.8, 25, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 570, 71, 137, 37, 137, 37, 151, 45, 0, 285, GrowthRate.SLOW, null, false), @@ -2705,7 +2697,7 @@ export function initSpecies() { ), new PokemonSpecies(Species.MARSHADOW, 7, false, false, true, "Gloomdweller Pokémon", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false, true, new PokemonForm("Normal", "", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, true), - new PokemonForm("Zenith", "zenith", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300), + new PokemonForm("Zenith", "zenith", PokemonType.FIGHTING, PokemonType.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, false, null, false, true) ), new PokemonSpecies(Species.POIPOLE, 7, true, false, false, "Poison Pin Pokémon", PokemonType.POISON, null, 0.6, 1.8, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 420, 67, 73, 67, 73, 67, 73, 45, 0, 210, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.NAGANADEL, 7, true, false, false, "Poison Pin Pokémon", PokemonType.POISON, PokemonType.DRAGON, 3.6, 150, Abilities.BEAST_BOOST, Abilities.NONE, Abilities.NONE, 540, 73, 73, 73, 127, 73, 121, 45, 0, 270, GrowthRate.SLOW, null, false), diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 693338c145e..3884aa05b13 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -22,6 +22,7 @@ import { PartyMemberStrength } from "#enums/party-member-strength"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; import { Gender } from "#app/data/gender"; +import { signatureSpecies } from "./balance/signature-species"; /** Minimum BST for Pokemon generated onto the Elite Four's teams */ const ELITE_FOUR_MINIMUM_BST = 460; @@ -1744,148 +1745,6 @@ function getSpeciesFilterRandomPartyMemberFunc( }; } -type SignatureSpecies = { - [key in string]: (Species | Species[])[]; -}; - -/* - * The signature species for each Gym Leader, Elite Four member, and Champion. - * The key is the trainer type, and the value is an array of Species or Species arrays. - * This is in a separate const so it can be accessed from other places and not just the trainerConfigs - */ -export const signatureSpecies: SignatureSpecies = { - BROCK: [Species.GEODUDE, Species.ONIX], - MISTY: [Species.STARYU, Species.PSYDUCK], - LT_SURGE: [Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ], - ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP], - JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT], - SABRINA: [Species.ABRA, Species.MR_MIME, Species.ESPEON], - BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGMAR], - GIOVANNI: [Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F], - FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.DODUO], - BUGSY: [Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR], - WHITNEY: [Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG], - MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE], - CHUCK: [Species.POLIWRATH, Species.MANKEY], - JASMINE: [Species.MAGNEMITE, Species.STEELIX], - PRYCE: [Species.SEEL, Species.SWINUB], - CLAIR: [Species.DRATINI, Species.HORSEA, Species.GYARADOS], - ROXANNE: [Species.GEODUDE, Species.NOSEPASS], - BRAWLY: [Species.MACHOP, Species.MAKUHITA], - WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE], - FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL], - NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON], - WINONA: [Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY], - TATE: [Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE], - LIZA: [Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR], - JUAN: [Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.RELICANTH], - ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE], - GARDENIA: [Species.ROSELIA, Species.TANGELA, Species.TURTWIG], - MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR], - CRASHER_WAKE: [Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP], - FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB], - BYRON: [Species.SHIELDON, Species.BRONZOR, Species.AGGRON], - CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT], - VOLKNER: [Species.SHINX, Species.CHINCHOU, Species.ROTOM], - CILAN: [Species.PANSAGE, Species.FOONGUS, Species.PETILIL], - CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.NUMEL], - CRESS: [Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE], - CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE], - LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO], - ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI], - BURGH: [Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST], - ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK], - CLAY: [Species.DRILBUR, Species.SANDILE, Species.GOLETT], - SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET], - BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO], - DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO], - MARLON: [Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA], - VIOLA: [Species.SURSKIT, Species.SCATTERBUG], - GRANT: [Species.AMAURA, Species.TYRUNT], - KORRINA: [Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO], - RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT], - CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA], - VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME], - OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING], - WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL], - MILO: [Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET], - NESSA: [Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD], - KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL], - BEA: [Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS], - ALLISTER: [Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY], - OPAL: [Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING], - BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR], - GORDIE: [Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE], - MELONY: [Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME], - PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY], - MARNIE: [Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO], - RAIHAN: [Species.DURALUDON, Species.TURTONATOR, Species.GOOMY], - KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA], // Tera Bug Teddiursa - BRASSIUS: [Species.SUDOWOODO, Species.BRAMBLIN, Species.SMOLIV], // Tera Grass Sudowoodo - IONO: [Species.MISDREAVUS, Species.TADBULB, Species.WATTREL], // Tera Ghost Misdreavus - KOFU: [Species.CRABRAWLER, Species.VELUZA, Species.WIGLETT, Species.WINGULL], // Tera Water Crabrawler - LARRY: [Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA], // Tera Normal Starly - RYME: [Species.TOXEL, Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], // Tera Ghost Toxel - TULIP: [Species.FLABEBE, Species.FLITTLE, Species.RALTS, Species.GIRAFARIG], // Tera Psychic Flabebe - GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.CUBCHOO, Species.ALOLA_VULPIX], // Tera Ice Swablu - LORELEI: [ - Species.JYNX, - [Species.SLOWBRO, Species.GALAR_SLOWBRO], - Species.LAPRAS, - [Species.CLOYSTER, Species.ALOLA_SANDSLASH], - ], - BRUNO: [Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [Species.GOLEM, Species.ALOLA_GOLEM]], - AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK], - LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR], - WILL: [Species.XATU, Species.JYNX, [Species.SLOWBRO, Species.SLOWKING], Species.EXEGGUTOR], - KOGA: [[Species.MUK, Species.WEEZING], [Species.VENOMOTH, Species.ARIADOS], Species.CROBAT, Species.TENTACRUEL], - KAREN: [Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE], - SIDNEY: [ - [Species.SHIFTRY, Species.CACTURNE], - [Species.SHARPEDO, Species.CRAWDAUNT], - Species.ABSOL, - Species.MIGHTYENA, - ], - PHOEBE: [Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [Species.DRIFBLIM, Species.MISMAGIUS]], - GLACIA: [Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW], - DRAKE: [Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA], - AARON: [[Species.SCIZOR, Species.KLEAVOR], Species.HERACROSS, [Species.VESPIQUEN, Species.YANMEGA], Species.DRAPION], - BERTHA: [Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR], - FLINT: [ - [Species.RAPIDASH, Species.FLAREON], - Species.MAGMORTAR, - [Species.STEELIX, Species.LOPUNNY], - Species.INFERNAPE, - ], // Tera Fire Steelix or Lopunny - LUCIAN: [Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [Species.ALAKAZAM, Species.ESPEON]], - SHAUNTAL: [Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT], - MARSHAL: [Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK], - GRIMSLEY: [Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE], - CAITLIN: [Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS], - MALVA: [Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME], - SIEBOLD: [Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE], - WIKSTROM: [Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH], - DRASNA: [Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN], - HALA: [Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [Species.POLIWRATH, Species.ANNIHILAPE]], - MOLAYNE: [Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO], - OLIVIA: [Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC], - ACEROLA: [[Species.BANETTE, Species.DRIFBLIM], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND], - KAHILI: [[Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON], - MARNIE_ELITE: [Species.MORPEKO, Species.LIEPARD, [Species.TOXICROAK, Species.SCRAFTY], Species.GRIMMSNARL], - NESSA_ELITE: [Species.GOLISOPOD, [Species.QUAGSIRE, Species.PELIPPER], Species.TOXAPEX, Species.DREDNAW], - BEA_ELITE: [Species.HAWLUCHA, [Species.GRAPPLOCT, Species.SIRFETCHD], Species.FALINKS, Species.MACHAMP], - ALLISTER_ELITE: [Species.DUSKNOIR, [Species.POLTEAGEIST, Species.RUNERIGUS], Species.CURSOLA, Species.GENGAR], - RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON], - RIKA: [Species.CLODSIRE, [Species.DUGTRIO, Species.DONPHAN], Species.CAMERUPT, Species.WHISCASH], // Tera Ground Clodsire - POPPY: [Species.TINKATON, Species.BRONZONG, Species.CORVIKNIGHT, Species.COPPERAJAH], // Tera Steel Tinkaton - LARRY_ELITE: [Species.FLAMIGO, Species.STARAPTOR, [Species.ALTARIA, Species.TROPIUS], Species.ORICORIO], // Tera Flying Flamigo; random Oricorio - HASSEL: [Species.BAXCALIBUR, [Species.FLAPPLE, Species.APPLETUN], Species.DRAGALGE, Species.NOIVERN], // Tera Dragon Baxcalibur - CRISPIN: [Species.BLAZIKEN, Species.MAGMORTAR, [Species.CAMERUPT, Species.TALONFLAME], Species.ROTOM], // Tera Fire Blaziken; Heat Rotom - AMARYS: [Species.METAGROSS, Species.SCIZOR, Species.EMPOLEON, Species.SKARMORY], // Tera Steel Metagross - LACEY: [Species.EXCADRILL, Species.PRIMARINA, [Species.WHIMSICOTT, Species.ALCREMIE], Species.GRANBULL], // Tera Fairy Excadrill - DRAYTON: [Species.ARCHALUDON, Species.DRAGONITE, Species.HAXORUS, Species.SCEPTILE], // Tera Dragon Archaludon -}; - export const trainerConfigs: TrainerConfigs = { [TrainerType.UNKNOWN]: new TrainerConfig(0).setHasGenders(), [TrainerType.ACE_TRAINER]: new TrainerConfig(++t) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 7c480be1873..ba663466c80 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -6921,10 +6921,10 @@ export class EnemyPokemon extends Pokemon { if ( speciesId in Overrides.OPP_FORM_OVERRIDES && - Overrides.OPP_FORM_OVERRIDES[speciesId] && + !isNullOrUndefined(Overrides.OPP_FORM_OVERRIDES[speciesId]) && this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]] ) { - this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId] ?? 0; + this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId]; } if (!dataSource) { diff --git a/src/field/trainer.ts b/src/field/trainer.ts index 4325b54a783..98919ebfa93 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -9,7 +9,6 @@ import { TrainerSlot, trainerConfigs, trainerPartyTemplates, - signatureSpecies, TeraAIMode, } from "#app/data/trainer-config"; import type { EnemyPokemon } from "#app/field/pokemon"; @@ -22,6 +21,7 @@ import i18next from "i18next"; import { PartyMemberStrength } from "#enums/party-member-strength"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; +import { signatureSpecies } from "#app/data/balance/signature-species"; export enum TrainerVariant { DEFAULT, diff --git a/src/overrides.ts b/src/overrides.ts index dc04f72049a..882a634ff90 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -1,5 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ -/* eslint-disable @typescript-eslint/consistent-type-imports */ import { type PokeballCounts } from "#app/battle-scene"; import { EvolutionItem } from "#app/data/balance/pokemon-evolutions"; import { Gender } from "#app/data/gender"; diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index 103174a4c83..0f4360b0af6 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -53,6 +53,7 @@ export class SelectStarterPhase extends Phase { let starterFormIndex = Math.min(starterProps.formIndex, Math.max(starter.species.forms.length - 1, 0)); if ( starter.species.speciesId in Overrides.STARTER_FORM_OVERRIDES && + !Utils.isNullOrUndefined(Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]) && starter.species.forms[Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!] ) { starterFormIndex = Overrides.STARTER_FORM_OVERRIDES[starter.species.speciesId]!;