diff --git a/public/audio/cry/670-eternal.ogg b/public/audio/cry/2670.ogg similarity index 100% rename from public/audio/cry/670-eternal.ogg rename to public/audio/cry/2670.ogg diff --git a/public/audio/cry/901-bloodmoon.ogg b/public/audio/cry/8901.ogg similarity index 100% rename from public/audio/cry/901-bloodmoon.ogg rename to public/audio/cry/8901.ogg diff --git a/public/images/pokemon/670-eternal.json b/public/images/pokemon/2670.json similarity index 95% rename from public/images/pokemon/670-eternal.json rename to public/images/pokemon/2670.json index e9a6f1d66..cf4aa8534 100644 --- a/public/images/pokemon/670-eternal.json +++ b/public/images/pokemon/2670.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "670-eternal.png", + "image": "2670.png", "format": "RGBA8888", "size": { "w": 67, diff --git a/public/images/pokemon/670-eternal.png b/public/images/pokemon/2670.png similarity index 100% rename from public/images/pokemon/670-eternal.png rename to public/images/pokemon/2670.png diff --git a/public/images/pokemon/901-bloodmoon.json b/public/images/pokemon/8901.json similarity index 94% rename from public/images/pokemon/901-bloodmoon.json rename to public/images/pokemon/8901.json index 9bf016a52..bdc7609db 100644 --- a/public/images/pokemon/901-bloodmoon.json +++ b/public/images/pokemon/8901.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "901-bloodmoon.png", + "image": "8901.png", "format": "RGBA8888", "size": { "w": 77, diff --git a/public/images/pokemon/901-bloodmoon.png b/public/images/pokemon/8901.png similarity index 100% rename from public/images/pokemon/901-bloodmoon.png rename to public/images/pokemon/8901.png diff --git a/public/images/pokemon/back/670-eternal.json b/public/images/pokemon/back/2670.json similarity index 95% rename from public/images/pokemon/back/670-eternal.json rename to public/images/pokemon/back/2670.json index 4e7f0465f..c48222fc7 100644 --- a/public/images/pokemon/back/670-eternal.json +++ b/public/images/pokemon/back/2670.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "670-eternal.png", + "image": "2670.png", "format": "RGBA8888", "size": { "w": 67, diff --git a/public/images/pokemon/back/670-eternal.png b/public/images/pokemon/back/2670.png similarity index 100% rename from public/images/pokemon/back/670-eternal.png rename to public/images/pokemon/back/2670.png diff --git a/public/images/pokemon/back/shiny/901-bloodmoon.json b/public/images/pokemon/back/8901.json similarity index 94% rename from public/images/pokemon/back/shiny/901-bloodmoon.json rename to public/images/pokemon/back/8901.json index 65cb6ba1c..5616649c6 100644 --- a/public/images/pokemon/back/shiny/901-bloodmoon.json +++ b/public/images/pokemon/back/8901.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "901-bloodmoon.png", + "image": "8901.png", "format": "RGBA8888", "size": { "w": 80, diff --git a/public/images/pokemon/back/901-bloodmoon.png b/public/images/pokemon/back/8901.png similarity index 100% rename from public/images/pokemon/back/901-bloodmoon.png rename to public/images/pokemon/back/8901.png diff --git a/public/images/pokemon/back/shiny/670-eternal.json b/public/images/pokemon/back/shiny/2670.json similarity index 95% rename from public/images/pokemon/back/shiny/670-eternal.json rename to public/images/pokemon/back/shiny/2670.json index 15ad5aa49..2907fd21a 100644 --- a/public/images/pokemon/back/shiny/670-eternal.json +++ b/public/images/pokemon/back/shiny/2670.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "670-eternal.png", + "image": "2670.png", "format": "RGBA8888", "size": { "w": 67, diff --git a/public/images/pokemon/back/shiny/670-eternal.png b/public/images/pokemon/back/shiny/2670.png similarity index 100% rename from public/images/pokemon/back/shiny/670-eternal.png rename to public/images/pokemon/back/shiny/2670.png diff --git a/public/images/pokemon/back/901-bloodmoon.json b/public/images/pokemon/back/shiny/8901.json similarity index 94% rename from public/images/pokemon/back/901-bloodmoon.json rename to public/images/pokemon/back/shiny/8901.json index 65cb6ba1c..5616649c6 100644 --- a/public/images/pokemon/back/901-bloodmoon.json +++ b/public/images/pokemon/back/shiny/8901.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "901-bloodmoon.png", + "image": "8901.png", "format": "RGBA8888", "size": { "w": 80, diff --git a/public/images/pokemon/back/shiny/901-bloodmoon.png b/public/images/pokemon/back/shiny/8901.png similarity index 100% rename from public/images/pokemon/back/shiny/901-bloodmoon.png rename to public/images/pokemon/back/shiny/8901.png diff --git a/public/images/pokemon/icons/670-eternal.png b/public/images/pokemon/icons/2670.png similarity index 100% rename from public/images/pokemon/icons/670-eternal.png rename to public/images/pokemon/icons/2670.png diff --git a/public/images/pokemon/icons/670s-eternal.png b/public/images/pokemon/icons/2670s.png similarity index 100% rename from public/images/pokemon/icons/670s-eternal.png rename to public/images/pokemon/icons/2670s.png diff --git a/public/images/pokemon/icons/901-bloodmoon.png b/public/images/pokemon/icons/8901.png similarity index 100% rename from public/images/pokemon/icons/901-bloodmoon.png rename to public/images/pokemon/icons/8901.png diff --git a/public/images/pokemon/icons/901s-bloodmoon.png b/public/images/pokemon/icons/8901s.png similarity index 100% rename from public/images/pokemon/icons/901s-bloodmoon.png rename to public/images/pokemon/icons/8901s.png diff --git a/public/images/pokemon/icons/icons.ps1 b/public/images/pokemon/icons/icons.ps1 index 5a84a4730..3e7a534f0 100644 --- a/public/images/pokemon/icons/icons.ps1 +++ b/public/images/pokemon/icons/icons.ps1 @@ -877,7 +877,6 @@ $pkmnTable = @{ "floette-orange" = "670-orange" "floette-blue" = "670-blue" "floette-white" = "670-white" - "floette-eternal" = "670-eternal" "florges" = "671" "florges-yellow" = "671-yellow" "florges-orange" = "671-orange" @@ -1192,7 +1191,6 @@ $pkmnTable = @{ "wyrdeer" = "899" "kleavor" = "900" "ursaluna" = "901" - "ursaluna-bloodmoon" = "901-bloodmoon" "basculegion" = "902" "basculegion-female" = "902-female" "sneasler" = "903" @@ -1360,6 +1358,7 @@ $pkmnTable = @{ "muk-alola" = "2089" "exeggutor-alola" = "2103" "marowak-alola" = "2105" + "eternal-floette" = "2670" "meowth-galar" = "4052" "ponyta-galar" = "4077" "rapidash-galar" = "4078" @@ -1400,6 +1399,7 @@ $pkmnTable = @{ "tauros-blaze-paldea" = "8128-blaze" "tauros-aqua-paldea" = "8128-aqua" "wooper-paldea" = "8194" + "bloodmoon-ursaluna" = "8901" } $dir = "." diff --git a/public/images/pokemon/shiny/670-eternal.json b/public/images/pokemon/shiny/2670.json similarity index 95% rename from public/images/pokemon/shiny/670-eternal.json rename to public/images/pokemon/shiny/2670.json index a9c9b6c04..37eea882c 100644 --- a/public/images/pokemon/shiny/670-eternal.json +++ b/public/images/pokemon/shiny/2670.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "670-eternal.png", + "image": "2670.png", "format": "RGBA8888", "size": { "w": 67, diff --git a/public/images/pokemon/shiny/670-eternal.png b/public/images/pokemon/shiny/2670.png similarity index 100% rename from public/images/pokemon/shiny/670-eternal.png rename to public/images/pokemon/shiny/2670.png diff --git a/public/images/pokemon/shiny/901-bloodmoon.json b/public/images/pokemon/shiny/8901.json similarity index 94% rename from public/images/pokemon/shiny/901-bloodmoon.json rename to public/images/pokemon/shiny/8901.json index 9bf016a52..bdc7609db 100644 --- a/public/images/pokemon/shiny/901-bloodmoon.json +++ b/public/images/pokemon/shiny/8901.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "901-bloodmoon.png", + "image": "8901.png", "format": "RGBA8888", "size": { "w": 77, diff --git a/public/images/pokemon/shiny/901-bloodmoon.png b/public/images/pokemon/shiny/8901.png similarity index 100% rename from public/images/pokemon/shiny/901-bloodmoon.png rename to public/images/pokemon/shiny/8901.png diff --git a/public/images/ui/pokemon_icons_6.json b/public/images/ui/pokemon_icons_6.json index 037b8c9a6..0d2e1677f 100644 --- a/public/images/ui/pokemon_icons_6.json +++ b/public/images/ui/pokemon_icons_6.json @@ -3643,7 +3643,7 @@ } }, { - "filename": "670-eternal", + "filename": "2670", "rotated": false, "trimmed": true, "sourceSize": { @@ -3664,7 +3664,7 @@ } }, { - "filename": "670s-eternal", + "filename": "2670s", "rotated": false, "trimmed": true, "sourceSize": { diff --git a/public/images/ui/pokemon_icons_8.json b/public/images/ui/pokemon_icons_8.json index 101c937b1..cda77e3eb 100644 --- a/public/images/ui/pokemon_icons_8.json +++ b/public/images/ui/pokemon_icons_8.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_8.png", "format": "RGBA8888", "size": { - "w": 255, - "h": 809 + "w": 252, + "h": 807 }, "scale": 1, "frames": [ @@ -3111,8 +3111,8 @@ "h": 25 }, "frame": { - "x": 222, - "y": 286, + "x": 0, + "y": 311, "w": 33, "h": 25 } @@ -3132,7 +3132,7 @@ "h": 25 }, "frame": { - "x": 0, + "x": 33, "y": 311, "w": 16, "h": 25 @@ -3153,7 +3153,7 @@ "h": 25 }, "frame": { - "x": 16, + "x": 49, "y": 311, "w": 16, "h": 25 @@ -3174,7 +3174,7 @@ "h": 25 }, "frame": { - "x": 32, + "x": 65, "y": 311, "w": 24, "h": 25 @@ -3195,7 +3195,7 @@ "h": 25 }, "frame": { - "x": 56, + "x": 89, "y": 311, "w": 24, "h": 25 @@ -3216,7 +3216,7 @@ "h": 25 }, "frame": { - "x": 80, + "x": 113, "y": 311, "w": 27, "h": 25 @@ -3237,7 +3237,7 @@ "h": 25 }, "frame": { - "x": 107, + "x": 140, "y": 311, "w": 27, "h": 25 @@ -3258,7 +3258,7 @@ "h": 25 }, "frame": { - "x": 134, + "x": 167, "y": 311, "w": 20, "h": 25 @@ -3279,7 +3279,7 @@ "h": 25 }, "frame": { - "x": 154, + "x": 187, "y": 311, "w": 20, "h": 25 @@ -3300,7 +3300,7 @@ "h": 25 }, "frame": { - "x": 174, + "x": 207, "y": 311, "w": 24, "h": 25 @@ -3321,8 +3321,8 @@ "h": 25 }, "frame": { - "x": 198, - "y": 311, + "x": 0, + "y": 336, "w": 24, "h": 25 } @@ -3342,8 +3342,8 @@ "h": 25 }, "frame": { - "x": 222, - "y": 311, + "x": 24, + "y": 336, "w": 30, "h": 25 } @@ -3363,7 +3363,7 @@ "h": 25 }, "frame": { - "x": 0, + "x": 54, "y": 336, "w": 30, "h": 25 @@ -3384,7 +3384,7 @@ "h": 25 }, "frame": { - "x": 30, + "x": 84, "y": 336, "w": 32, "h": 25 @@ -3405,7 +3405,7 @@ "h": 25 }, "frame": { - "x": 62, + "x": 116, "y": 336, "w": 32, "h": 25 @@ -3426,7 +3426,7 @@ "h": 25 }, "frame": { - "x": 94, + "x": 148, "y": 336, "w": 30, "h": 25 @@ -3447,7 +3447,7 @@ "h": 25 }, "frame": { - "x": 124, + "x": 178, "y": 336, "w": 30, "h": 25 @@ -3468,7 +3468,7 @@ "h": 25 }, "frame": { - "x": 154, + "x": 208, "y": 336, "w": 29, "h": 25 @@ -3489,8 +3489,8 @@ "h": 25 }, "frame": { - "x": 183, - "y": 336, + "x": 0, + "y": 361, "w": 29, "h": 25 } @@ -3510,8 +3510,8 @@ "h": 25 }, "frame": { - "x": 212, - "y": 336, + "x": 29, + "y": 361, "w": 26, "h": 25 } @@ -3531,7 +3531,7 @@ "h": 25 }, "frame": { - "x": 0, + "x": 55, "y": 361, "w": 26, "h": 25 @@ -3552,7 +3552,7 @@ "h": 25 }, "frame": { - "x": 26, + "x": 81, "y": 361, "w": 30, "h": 25 @@ -3573,7 +3573,7 @@ "h": 25 }, "frame": { - "x": 56, + "x": 111, "y": 361, "w": 30, "h": 25 @@ -3594,7 +3594,7 @@ "h": 25 }, "frame": { - "x": 86, + "x": 141, "y": 361, "w": 33, "h": 25 @@ -3615,7 +3615,7 @@ "h": 25 }, "frame": { - "x": 119, + "x": 174, "y": 361, "w": 33, "h": 25 @@ -3636,7 +3636,7 @@ "h": 25 }, "frame": { - "x": 152, + "x": 207, "y": 361, "w": 18, "h": 25 @@ -3657,7 +3657,7 @@ "h": 25 }, "frame": { - "x": 170, + "x": 225, "y": 361, "w": 18, "h": 25 @@ -3678,8 +3678,8 @@ "h": 25 }, "frame": { - "x": 188, - "y": 361, + "x": 0, + "y": 386, "w": 27, "h": 25 } @@ -3699,8 +3699,8 @@ "h": 25 }, "frame": { - "x": 215, - "y": 361, + "x": 27, + "y": 386, "w": 27, "h": 25 } @@ -3720,7 +3720,7 @@ "h": 25 }, "frame": { - "x": 0, + "x": 54, "y": 386, "w": 29, "h": 25 @@ -3741,7 +3741,7 @@ "h": 25 }, "frame": { - "x": 29, + "x": 83, "y": 386, "w": 29, "h": 25 @@ -3762,7 +3762,7 @@ "h": 26 }, "frame": { - "x": 58, + "x": 112, "y": 386, "w": 24, "h": 26 @@ -3783,7 +3783,7 @@ "h": 26 }, "frame": { - "x": 82, + "x": 136, "y": 386, "w": 24, "h": 26 @@ -3804,7 +3804,7 @@ "h": 26 }, "frame": { - "x": 106, + "x": 160, "y": 386, "w": 28, "h": 26 @@ -3825,7 +3825,7 @@ "h": 26 }, "frame": { - "x": 134, + "x": 188, "y": 386, "w": 28, "h": 26 @@ -3846,7 +3846,7 @@ "h": 26 }, "frame": { - "x": 162, + "x": 216, "y": 386, "w": 26, "h": 26 @@ -3867,8 +3867,8 @@ "h": 26 }, "frame": { - "x": 188, - "y": 386, + "x": 0, + "y": 412, "w": 26, "h": 26 } @@ -3888,8 +3888,8 @@ "h": 26 }, "frame": { - "x": 214, - "y": 386, + "x": 26, + "y": 412, "w": 25, "h": 26 } @@ -3909,7 +3909,7 @@ "h": 26 }, "frame": { - "x": 0, + "x": 51, "y": 412, "w": 25, "h": 26 @@ -3930,7 +3930,7 @@ "h": 26 }, "frame": { - "x": 25, + "x": 76, "y": 412, "w": 29, "h": 26 @@ -3951,7 +3951,7 @@ "h": 26 }, "frame": { - "x": 54, + "x": 105, "y": 412, "w": 29, "h": 26 @@ -3972,7 +3972,7 @@ "h": 26 }, "frame": { - "x": 83, + "x": 134, "y": 412, "w": 29, "h": 26 @@ -3993,7 +3993,7 @@ "h": 26 }, "frame": { - "x": 112, + "x": 163, "y": 412, "w": 29, "h": 26 @@ -4014,7 +4014,7 @@ "h": 26 }, "frame": { - "x": 141, + "x": 192, "y": 412, "w": 24, "h": 26 @@ -4035,7 +4035,7 @@ "h": 26 }, "frame": { - "x": 165, + "x": 216, "y": 412, "w": 24, "h": 26 @@ -4056,8 +4056,8 @@ "h": 26 }, "frame": { - "x": 189, - "y": 412, + "x": 0, + "y": 438, "w": 29, "h": 26 } @@ -4077,8 +4077,8 @@ "h": 26 }, "frame": { - "x": 218, - "y": 412, + "x": 29, + "y": 438, "w": 29, "h": 26 } @@ -4098,7 +4098,7 @@ "h": 26 }, "frame": { - "x": 0, + "x": 58, "y": 438, "w": 22, "h": 26 @@ -4119,7 +4119,7 @@ "h": 26 }, "frame": { - "x": 22, + "x": 80, "y": 438, "w": 22, "h": 26 @@ -4140,7 +4140,7 @@ "h": 26 }, "frame": { - "x": 44, + "x": 102, "y": 438, "w": 25, "h": 26 @@ -4161,7 +4161,7 @@ "h": 26 }, "frame": { - "x": 69, + "x": 127, "y": 438, "w": 25, "h": 26 @@ -4182,7 +4182,7 @@ "h": 26 }, "frame": { - "x": 94, + "x": 152, "y": 438, "w": 21, "h": 26 @@ -4203,7 +4203,7 @@ "h": 26 }, "frame": { - "x": 115, + "x": 173, "y": 438, "w": 21, "h": 26 @@ -4224,7 +4224,7 @@ "h": 26 }, "frame": { - "x": 136, + "x": 194, "y": 438, "w": 28, "h": 26 @@ -4245,7 +4245,7 @@ "h": 26 }, "frame": { - "x": 164, + "x": 222, "y": 438, "w": 28, "h": 26 @@ -4266,8 +4266,8 @@ "h": 26 }, "frame": { - "x": 192, - "y": 438, + "x": 0, + "y": 464, "w": 35, "h": 26 } @@ -4287,7 +4287,7 @@ "h": 26 }, "frame": { - "x": 0, + "x": 35, "y": 464, "w": 35, "h": 26 @@ -4308,7 +4308,7 @@ "h": 26 }, "frame": { - "x": 35, + "x": 70, "y": 464, "w": 35, "h": 26 @@ -4329,7 +4329,7 @@ "h": 26 }, "frame": { - "x": 70, + "x": 105, "y": 464, "w": 35, "h": 26 @@ -4350,7 +4350,7 @@ "h": 26 }, "frame": { - "x": 105, + "x": 140, "y": 464, "w": 26, "h": 26 @@ -4371,7 +4371,7 @@ "h": 26 }, "frame": { - "x": 131, + "x": 166, "y": 464, "w": 26, "h": 26 @@ -4392,7 +4392,7 @@ "h": 26 }, "frame": { - "x": 157, + "x": 192, "y": 464, "w": 28, "h": 26 @@ -4413,7 +4413,7 @@ "h": 26 }, "frame": { - "x": 185, + "x": 220, "y": 464, "w": 28, "h": 26 @@ -4434,8 +4434,8 @@ "h": 26 }, "frame": { - "x": 213, - "y": 464, + "x": 0, + "y": 490, "w": 34, "h": 26 } @@ -4455,7 +4455,7 @@ "h": 26 }, "frame": { - "x": 0, + "x": 34, "y": 490, "w": 34, "h": 26 @@ -4476,7 +4476,7 @@ "h": 26 }, "frame": { - "x": 34, + "x": 68, "y": 490, "w": 40, "h": 26 @@ -4497,7 +4497,7 @@ "h": 26 }, "frame": { - "x": 74, + "x": 108, "y": 490, "w": 40, "h": 26 @@ -4518,7 +4518,7 @@ "h": 27 }, "frame": { - "x": 114, + "x": 148, "y": 490, "w": 27, "h": 27 @@ -4539,7 +4539,7 @@ "h": 27 }, "frame": { - "x": 141, + "x": 175, "y": 490, "w": 27, "h": 27 @@ -4560,7 +4560,7 @@ "h": 27 }, "frame": { - "x": 168, + "x": 202, "y": 490, "w": 28, "h": 27 @@ -4581,8 +4581,8 @@ "h": 27 }, "frame": { - "x": 196, - "y": 490, + "x": 0, + "y": 517, "w": 28, "h": 27 } @@ -4602,8 +4602,8 @@ "h": 27 }, "frame": { - "x": 224, - "y": 490, + "x": 28, + "y": 517, "w": 18, "h": 27 } @@ -4623,7 +4623,7 @@ "h": 27 }, "frame": { - "x": 0, + "x": 46, "y": 517, "w": 18, "h": 27 @@ -4644,7 +4644,7 @@ "h": 27 }, "frame": { - "x": 18, + "x": 64, "y": 517, "w": 24, "h": 27 @@ -4665,7 +4665,7 @@ "h": 27 }, "frame": { - "x": 42, + "x": 88, "y": 517, "w": 24, "h": 27 @@ -4686,7 +4686,7 @@ "h": 27 }, "frame": { - "x": 66, + "x": 112, "y": 517, "w": 24, "h": 27 @@ -4707,7 +4707,7 @@ "h": 27 }, "frame": { - "x": 90, + "x": 136, "y": 517, "w": 24, "h": 27 @@ -4728,7 +4728,7 @@ "h": 27 }, "frame": { - "x": 114, + "x": 160, "y": 517, "w": 25, "h": 27 @@ -4749,7 +4749,7 @@ "h": 27 }, "frame": { - "x": 139, + "x": 185, "y": 517, "w": 25, "h": 27 @@ -4770,7 +4770,7 @@ "h": 27 }, "frame": { - "x": 164, + "x": 210, "y": 517, "w": 27, "h": 27 @@ -4791,8 +4791,8 @@ "h": 27 }, "frame": { - "x": 191, - "y": 517, + "x": 0, + "y": 544, "w": 27, "h": 27 } @@ -4812,8 +4812,8 @@ "h": 27 }, "frame": { - "x": 218, - "y": 517, + "x": 27, + "y": 544, "w": 30, "h": 27 } @@ -4833,7 +4833,7 @@ "h": 27 }, "frame": { - "x": 0, + "x": 57, "y": 544, "w": 30, "h": 27 @@ -4854,7 +4854,7 @@ "h": 27 }, "frame": { - "x": 30, + "x": 87, "y": 544, "w": 28, "h": 27 @@ -4875,7 +4875,7 @@ "h": 27 }, "frame": { - "x": 58, + "x": 115, "y": 544, "w": 28, "h": 27 @@ -4896,7 +4896,7 @@ "h": 28 }, "frame": { - "x": 86, + "x": 143, "y": 544, "w": 19, "h": 28 @@ -4917,7 +4917,7 @@ "h": 28 }, "frame": { - "x": 105, + "x": 162, "y": 544, "w": 19, "h": 28 @@ -4938,7 +4938,7 @@ "h": 28 }, "frame": { - "x": 124, + "x": 181, "y": 544, "w": 26, "h": 28 @@ -4959,7 +4959,7 @@ "h": 28 }, "frame": { - "x": 150, + "x": 207, "y": 544, "w": 26, "h": 28 @@ -4980,8 +4980,8 @@ "h": 28 }, "frame": { - "x": 176, - "y": 544, + "x": 0, + "y": 572, "w": 27, "h": 28 } @@ -5001,8 +5001,8 @@ "h": 28 }, "frame": { - "x": 203, - "y": 544, + "x": 27, + "y": 572, "w": 27, "h": 28 } @@ -5022,7 +5022,7 @@ "h": 28 }, "frame": { - "x": 0, + "x": 54, "y": 572, "w": 40, "h": 28 @@ -5043,7 +5043,7 @@ "h": 28 }, "frame": { - "x": 40, + "x": 94, "y": 572, "w": 40, "h": 28 @@ -5064,7 +5064,7 @@ "h": 28 }, "frame": { - "x": 80, + "x": 134, "y": 572, "w": 32, "h": 28 @@ -5085,7 +5085,7 @@ "h": 28 }, "frame": { - "x": 112, + "x": 166, "y": 572, "w": 32, "h": 28 @@ -5106,7 +5106,7 @@ "h": 28 }, "frame": { - "x": 144, + "x": 198, "y": 572, "w": 30, "h": 28 @@ -5127,8 +5127,8 @@ "h": 28 }, "frame": { - "x": 174, - "y": 572, + "x": 0, + "y": 600, "w": 30, "h": 28 } @@ -5148,8 +5148,8 @@ "h": 29 }, "frame": { - "x": 204, - "y": 572, + "x": 30, + "y": 600, "w": 24, "h": 29 } @@ -5169,8 +5169,8 @@ "h": 29 }, "frame": { - "x": 228, - "y": 572, + "x": 54, + "y": 600, "w": 24, "h": 29 } @@ -5190,8 +5190,8 @@ "h": 29 }, "frame": { - "x": 0, - "y": 601, + "x": 78, + "y": 600, "w": 27, "h": 29 } @@ -5211,8 +5211,8 @@ "h": 29 }, "frame": { - "x": 27, - "y": 601, + "x": 105, + "y": 600, "w": 27, "h": 29 } @@ -5232,8 +5232,8 @@ "h": 29 }, "frame": { - "x": 54, - "y": 601, + "x": 132, + "y": 600, "w": 31, "h": 29 } @@ -5253,8 +5253,8 @@ "h": 29 }, "frame": { - "x": 85, - "y": 601, + "x": 163, + "y": 600, "w": 31, "h": 29 } @@ -5274,8 +5274,8 @@ "h": 29 }, "frame": { - "x": 116, - "y": 601, + "x": 194, + "y": 600, "w": 27, "h": 29 } @@ -5295,8 +5295,8 @@ "h": 29 }, "frame": { - "x": 143, - "y": 601, + "x": 221, + "y": 600, "w": 27, "h": 29 } @@ -5316,8 +5316,8 @@ "h": 29 }, "frame": { - "x": 170, - "y": 601, + "x": 0, + "y": 629, "w": 32, "h": 29 } @@ -5337,8 +5337,8 @@ "h": 29 }, "frame": { - "x": 202, - "y": 601, + "x": 32, + "y": 629, "w": 32, "h": 29 } @@ -5358,8 +5358,8 @@ "h": 29 }, "frame": { - "x": 0, - "y": 630, + "x": 64, + "y": 629, "w": 33, "h": 29 } @@ -5379,8 +5379,8 @@ "h": 29 }, "frame": { - "x": 33, - "y": 630, + "x": 97, + "y": 629, "w": 33, "h": 29 } @@ -5400,8 +5400,8 @@ "h": 29 }, "frame": { - "x": 66, - "y": 630, + "x": 130, + "y": 629, "w": 19, "h": 29 } @@ -5421,8 +5421,8 @@ "h": 29 }, "frame": { - "x": 85, - "y": 630, + "x": 149, + "y": 629, "w": 19, "h": 29 } @@ -5442,8 +5442,8 @@ "h": 29 }, "frame": { - "x": 104, - "y": 630, + "x": 168, + "y": 629, "w": 28, "h": 29 } @@ -5463,8 +5463,8 @@ "h": 29 }, "frame": { - "x": 132, - "y": 630, + "x": 196, + "y": 629, "w": 28, "h": 29 } @@ -5484,8 +5484,8 @@ "h": 29 }, "frame": { - "x": 160, - "y": 630, + "x": 224, + "y": 629, "w": 24, "h": 29 } @@ -5505,8 +5505,8 @@ "h": 29 }, "frame": { - "x": 184, - "y": 630, + "x": 0, + "y": 658, "w": 24, "h": 29 } @@ -5526,8 +5526,8 @@ "h": 29 }, "frame": { - "x": 208, - "y": 630, + "x": 24, + "y": 658, "w": 23, "h": 29 } @@ -5547,8 +5547,8 @@ "h": 29 }, "frame": { - "x": 231, - "y": 630, + "x": 47, + "y": 658, "w": 23, "h": 29 } @@ -5568,8 +5568,8 @@ "h": 29 }, "frame": { - "x": 0, - "y": 659, + "x": 70, + "y": 658, "w": 30, "h": 29 } @@ -5589,8 +5589,8 @@ "h": 29 }, "frame": { - "x": 30, - "y": 659, + "x": 100, + "y": 658, "w": 30, "h": 29 } @@ -5610,8 +5610,8 @@ "h": 29 }, "frame": { - "x": 60, - "y": 659, + "x": 130, + "y": 658, "w": 22, "h": 29 } @@ -5631,8 +5631,8 @@ "h": 29 }, "frame": { - "x": 82, - "y": 659, + "x": 152, + "y": 658, "w": 22, "h": 29 } @@ -5652,8 +5652,8 @@ "h": 29 }, "frame": { - "x": 104, - "y": 659, + "x": 174, + "y": 658, "w": 30, "h": 29 } @@ -5673,8 +5673,8 @@ "h": 29 }, "frame": { - "x": 134, - "y": 659, + "x": 204, + "y": 658, "w": 30, "h": 29 } @@ -5694,8 +5694,8 @@ "h": 29 }, "frame": { - "x": 164, - "y": 659, + "x": 0, + "y": 687, "w": 26, "h": 29 } @@ -5715,8 +5715,8 @@ "h": 29 }, "frame": { - "x": 190, - "y": 659, + "x": 26, + "y": 687, "w": 26, "h": 29 } @@ -5736,8 +5736,8 @@ "h": 30 }, "frame": { - "x": 216, - "y": 659, + "x": 52, + "y": 687, "w": 17, "h": 30 } @@ -5757,8 +5757,8 @@ "h": 30 }, "frame": { - "x": 233, - "y": 659, + "x": 69, + "y": 687, "w": 17, "h": 30 } @@ -5778,8 +5778,8 @@ "h": 30 }, "frame": { - "x": 0, - "y": 689, + "x": 86, + "y": 687, "w": 32, "h": 30 } @@ -5799,8 +5799,8 @@ "h": 30 }, "frame": { - "x": 32, - "y": 689, + "x": 118, + "y": 687, "w": 32, "h": 30 } @@ -5820,8 +5820,8 @@ "h": 30 }, "frame": { - "x": 64, - "y": 689, + "x": 150, + "y": 687, "w": 39, "h": 30 } @@ -5841,8 +5841,8 @@ "h": 30 }, "frame": { - "x": 103, - "y": 689, + "x": 189, + "y": 687, "w": 39, "h": 30 } @@ -5862,8 +5862,8 @@ "h": 30 }, "frame": { - "x": 142, - "y": 689, + "x": 0, + "y": 717, "w": 32, "h": 30 } @@ -5883,8 +5883,8 @@ "h": 30 }, "frame": { - "x": 174, - "y": 689, + "x": 32, + "y": 717, "w": 32, "h": 30 } @@ -5904,8 +5904,8 @@ "h": 30 }, "frame": { - "x": 206, - "y": 689, + "x": 64, + "y": 717, "w": 34, "h": 30 } @@ -5925,8 +5925,8 @@ "h": 30 }, "frame": { - "x": 0, - "y": 719, + "x": 98, + "y": 717, "w": 34, "h": 30 } @@ -5946,8 +5946,8 @@ "h": 30 }, "frame": { - "x": 34, - "y": 719, + "x": 132, + "y": 717, "w": 36, "h": 30 } @@ -5967,8 +5967,8 @@ "h": 30 }, "frame": { - "x": 70, - "y": 719, + "x": 168, + "y": 717, "w": 36, "h": 30 } @@ -5988,8 +5988,8 @@ "h": 30 }, "frame": { - "x": 106, - "y": 719, + "x": 204, + "y": 717, "w": 40, "h": 30 } @@ -6009,8 +6009,8 @@ "h": 30 }, "frame": { - "x": 146, - "y": 719, + "x": 0, + "y": 747, "w": 35, "h": 30 } @@ -6030,8 +6030,8 @@ "h": 30 }, "frame": { - "x": 181, - "y": 719, + "x": 35, + "y": 747, "w": 40, "h": 30 } @@ -6051,8 +6051,8 @@ "h": 30 }, "frame": { - "x": 0, - "y": 749, + "x": 75, + "y": 747, "w": 35, "h": 30 } @@ -6072,8 +6072,8 @@ "h": 30 }, "frame": { - "x": 35, - "y": 749, + "x": 110, + "y": 747, "w": 26, "h": 30 } @@ -6093,8 +6093,8 @@ "h": 30 }, "frame": { - "x": 61, - "y": 749, + "x": 136, + "y": 747, "w": 28, "h": 30 } @@ -6114,8 +6114,8 @@ "h": 30 }, "frame": { - "x": 89, - "y": 749, + "x": 164, + "y": 747, "w": 26, "h": 30 } @@ -6135,54 +6135,12 @@ "h": 30 }, "frame": { - "x": 115, - "y": 749, + "x": 190, + "y": 747, "w": 28, "h": 30 } }, - { - "filename": "901-bloodmoon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 - }, - "frame": { - "x": 143, - "y": 749, - "w": 32, - "h": 30 - } - }, - { - "filename": "901s-bloodmoon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 32, - "h": 30 - }, - "frame": { - "x": 175, - "y": 749, - "w": 32, - "h": 30 - } - }, { "filename": "905-incarnate", "rotated": false, @@ -6198,8 +6156,8 @@ "h": 30 }, "frame": { - "x": 207, - "y": 749, + "x": 218, + "y": 747, "w": 34, "h": 30 } @@ -6220,7 +6178,7 @@ }, "frame": { "x": 0, - "y": 779, + "y": 777, "w": 34, "h": 30 } @@ -6241,7 +6199,7 @@ }, "frame": { "x": 34, - "y": 779, + "y": 777, "w": 31, "h": 30 } @@ -6262,7 +6220,7 @@ }, "frame": { "x": 65, - "y": 779, + "y": 777, "w": 31, "h": 30 } @@ -6283,7 +6241,7 @@ }, "frame": { "x": 96, - "y": 779, + "y": 777, "w": 27, "h": 30 } @@ -6304,7 +6262,7 @@ }, "frame": { "x": 123, - "y": 779, + "y": 777, "w": 27, "h": 30 } @@ -6325,7 +6283,7 @@ }, "frame": { "x": 150, - "y": 779, + "y": 777, "w": 27, "h": 30 } @@ -6346,7 +6304,7 @@ }, "frame": { "x": 177, - "y": 779, + "y": 777, "w": 27, "h": 30 } @@ -6367,7 +6325,7 @@ }, "frame": { "x": 204, - "y": 779, + "y": 777, "w": 19, "h": 30 } @@ -6388,7 +6346,7 @@ }, "frame": { "x": 223, - "y": 779, + "y": 777, "w": 19, "h": 30 } @@ -6399,6 +6357,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:329fbdefa23c7270b894270a12c5f17f:24ad44a356662302da27f2c46fb16e4b:8190d2ecf16422e962cfb1a751b5e1fc$" + "smartupdate": "$TexturePacker:SmartUpdate:93e59fd8375d0a683f3ba086fe6ef8ee:876c47b8fb7d41fbdb6b7ce724c8e3fd:8190d2ecf16422e962cfb1a751b5e1fc$" } } diff --git a/public/images/ui/pokemon_icons_8.png b/public/images/ui/pokemon_icons_8.png index dff913fb5..9c86c8a92 100644 Binary files a/public/images/ui/pokemon_icons_8.png and b/public/images/ui/pokemon_icons_8.png differ diff --git a/public/images/ui/pokemon_icons_9.json b/public/images/ui/pokemon_icons_9.json index 6214c51f8..9730d57c5 100644 --- a/public/images/ui/pokemon_icons_9.json +++ b/public/images/ui/pokemon_icons_9.json @@ -4,8 +4,8 @@ "image": "pokemon_icons_9.png", "format": "RGBA8888", "size": { - "w": 252, - "h": 586 + "w": 249, + "h": 610 }, "scale": 1, "frames": [ @@ -382,7 +382,7 @@ }, "frame": { "x": 0, - "y": 270, + "y": 300, "w": 30, "h": 30 } @@ -430,7 +430,7 @@ } }, { - "filename": "992", + "filename": "934", "rotated": false, "trimmed": true, "sourceSize": { @@ -439,15 +439,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 2, - "w": 30, - "h": 26 + "y": 0, + "w": 27, + "h": 30 }, "frame": { "x": 222, "y": 0, - "w": 30, - "h": 26 + "w": 27, + "h": 30 } }, { @@ -535,7 +535,7 @@ } }, { - "filename": "934", + "filename": "8901", "rotated": false, "trimmed": true, "sourceSize": { @@ -543,16 +543,37 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 0, - "w": 27, - "h": 30 + "x": 5, + "y": 1, + "w": 30, + "h": 28 }, "frame": { "x": 0, - "y": 300, - "w": 27, + "y": 330, + "w": 30, + "h": 28 + } + }, + { + "filename": "8901s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 1, + "w": 30, + "h": 28 + }, + "frame": { + "x": 0, + "y": 358, + "w": 30, + "h": 28 } }, { @@ -571,7 +592,7 @@ }, "frame": { "x": 0, - "y": 330, + "y": 386, "w": 27, "h": 30 } @@ -618,27 +639,6 @@ "h": 25 } }, - { - "filename": "992s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 30, - "h": 26 - }, - "frame": { - "x": 222, - "y": 26, - "w": 30, - "h": 26 - } - }, { "filename": "995", "rotated": false, @@ -654,8 +654,8 @@ "h": 29 }, "frame": { - "x": 0, - "y": 360, + "x": 222, + "y": 30, "w": 27, "h": 29 } @@ -676,7 +676,7 @@ }, "frame": { "x": 0, - "y": 389, + "y": 416, "w": 27, "h": 29 } @@ -697,7 +697,7 @@ }, "frame": { "x": 0, - "y": 418, + "y": 445, "w": 29, "h": 28 } @@ -718,7 +718,7 @@ }, "frame": { "x": 0, - "y": 446, + "y": 473, "w": 29, "h": 28 } @@ -739,7 +739,7 @@ }, "frame": { "x": 0, - "y": 474, + "y": 501, "w": 29, "h": 27 } @@ -760,7 +760,7 @@ }, "frame": { "x": 0, - "y": 501, + "y": 528, "w": 29, "h": 27 } @@ -781,76 +781,13 @@ }, "frame": { "x": 0, - "y": 528, + "y": 555, "w": 28, "h": 28 } }, { - "filename": "983", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 0, - "y": 556, - "w": 25, - "h": 30 - } - }, - { - "filename": "983s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 25, - "h": 30 - }, - "frame": { - "x": 25, - "y": 556, - "w": 25, - "h": 30 - } - }, - { - "filename": "968", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 23, - "h": 28 - }, - "frame": { - "x": 28, - "y": 528, - "w": 23, - "h": 28 - } - }, - { - "filename": "981", + "filename": "8128-blaze", "rotated": false, "trimmed": true, "sourceSize": { @@ -859,15 +796,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 0, - "w": 23, - "h": 30 + "y": 2, + "w": 29, + "h": 27 }, "frame": { - "x": 50, - "y": 556, - "w": 23, - "h": 30 + "x": 0, + "y": 583, + "w": 29, + "h": 27 } }, { @@ -955,7 +892,7 @@ } }, { - "filename": "993", + "filename": "994", "rotated": false, "trimmed": true, "sourceSize": { @@ -963,16 +900,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 2, - "w": 30, - "h": 25 + "x": 8, + "y": 1, + "w": 27, + "h": 28 }, "frame": { "x": 222, - "y": 52, - "w": 30, - "h": 25 + "y": 59, + "w": 27, + "h": 28 } }, { @@ -1060,7 +997,7 @@ } }, { - "filename": "993s", + "filename": "1003s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1069,19 +1006,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 2, - "w": 30, - "h": 25 + "y": 0, + "w": 28, + "h": 28 }, "frame": { "x": 221, - "y": 77, - "w": 30, - "h": 25 + "y": 87, + "w": 28, + "h": 28 } }, { - "filename": "981s", + "filename": "981", "rotated": false, "trimmed": true, "sourceSize": { @@ -1096,7 +1033,7 @@ }, "frame": { "x": 27, - "y": 300, + "y": 386, "w": 23, "h": 30 } @@ -1117,13 +1054,13 @@ }, "frame": { "x": 27, - "y": 330, + "y": 416, "w": 22, "h": 29 } }, { - "filename": "964s-hero", + "filename": "981s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1133,18 +1070,102 @@ "spriteSourceSize": { "x": 9, "y": 0, - "w": 22, - "h": 29 + "w": 23, + "h": 30 }, "frame": { - "x": 27, - "y": 359, - "w": 22, - "h": 29 + "x": 29, + "y": 445, + "w": 23, + "h": 30 } }, { - "filename": "999", + "filename": "983", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 29, + "y": 475, + "w": 25, + "h": 30 + } + }, + { + "filename": "983s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 25, + "h": 30 + }, + "frame": { + "x": 29, + "y": 505, + "w": 25, + "h": 30 + } + }, + { + "filename": "911", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 29, + "y": 535, + "w": 28, + "h": 23 + } + }, + { + "filename": "993", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 30, + "h": 25 + }, + "frame": { + "x": 28, + "y": 558, + "w": 30, + "h": 25 + } + }, + { + "filename": "8128s-blaze", "rotated": false, "trimmed": true, "sourceSize": { @@ -1153,15 +1174,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 0, - "w": 22, - "h": 29 + "y": 2, + "w": 29, + "h": 27 }, "frame": { - "x": 27, - "y": 388, - "w": 22, - "h": 29 + "x": 29, + "y": 583, + "w": 29, + "h": 27 } }, { @@ -1179,8 +1200,8 @@ "h": 29 }, "frame": { - "x": 29, - "y": 417, + "x": 49, + "y": 416, "w": 21, "h": 29 } @@ -1200,14 +1221,14 @@ "h": 29 }, "frame": { - "x": 29, - "y": 446, + "x": 52, + "y": 445, "w": 21, "h": 29 } }, { - "filename": "999s", + "filename": "964s-hero", "rotated": false, "trimmed": true, "sourceSize": { @@ -1221,14 +1242,14 @@ "h": 29 }, "frame": { - "x": 29, - "y": 475, + "x": 54, + "y": 474, "w": 22, "h": 29 } }, { - "filename": "918", + "filename": "999", "rotated": false, "trimmed": true, "sourceSize": { @@ -1237,15 +1258,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 4, + "y": 0, "w": 22, - "h": 24 + "h": 29 }, "frame": { - "x": 29, - "y": 504, + "x": 54, + "y": 503, "w": 22, - "h": 24 + "h": 29 } }, { @@ -1263,12 +1284,180 @@ "h": 26 }, "frame": { - "x": 73, - "y": 86, + "x": 57, + "y": 532, "w": 20, "h": 26 } }, + { + "filename": "999s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 22, + "h": 29 + }, + "frame": { + "x": 58, + "y": 558, + "w": 22, + "h": 29 + } + }, + { + "filename": "911s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 58, + "y": 587, + "w": 28, + "h": 23 + } + }, + { + "filename": "947", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 70, + "y": 86, + "w": 23, + "h": 22 + } + }, + { + "filename": "992", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 93, + "y": 97, + "w": 30, + "h": 26 + } + }, + { + "filename": "992s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 30, + "h": 26 + }, + "frame": { + "x": 123, + "y": 97, + "w": 30, + "h": 26 + } + }, + { + "filename": "993s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 2, + "w": 30, + "h": 25 + }, + "frame": { + "x": 153, + "y": 101, + "w": 30, + "h": 25 + } + }, + { + "filename": "1022", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 3, + "w": 29, + "h": 25 + }, + "frame": { + "x": 183, + "y": 101, + "w": 29, + "h": 25 + } + }, + { + "filename": "947s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 6, + "w": 23, + "h": 22 + }, + "frame": { + "x": 70, + "y": 108, + "w": 23, + "h": 22 + } + }, { "filename": "924", "rotated": false, @@ -1285,7 +1474,7 @@ }, "frame": { "x": 93, - "y": 97, + "y": 123, "w": 29, "h": 20 } @@ -1306,7 +1495,7 @@ }, "frame": { "x": 122, - "y": 97, + "y": 123, "w": 29, "h": 20 } @@ -1327,7 +1516,7 @@ }, "frame": { "x": 151, - "y": 101, + "y": 126, "w": 29, "h": 22 } @@ -1348,13 +1537,13 @@ }, "frame": { "x": 180, - "y": 101, + "y": 126, "w": 29, "h": 22 } }, { - "filename": "1022", + "filename": "961", "rotated": false, "trimmed": true, "sourceSize": { @@ -1362,58 +1551,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 29, - "h": 25 + "x": 8, + "y": 5, + "w": 23, + "h": 23 }, "frame": { - "x": 209, - "y": 102, - "w": 29, - "h": 25 - } - }, - { - "filename": "999-roaming", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 14, - "h": 18 - }, - "frame": { - "x": 238, - "y": 102, - "w": 14, - "h": 18 - } - }, - { - "filename": "999s-roaming", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 14, - "h": 18 - }, - "frame": { - "x": 238, - "y": 120, - "w": 14, - "h": 18 + "x": 70, + "y": 130, + "w": 23, + "h": 23 } }, { @@ -1431,14 +1578,14 @@ "h": 20 }, "frame": { - "x": 31, - "y": 118, + "x": 93, + "y": 143, "w": 29, "h": 20 } }, { - "filename": "1003s", + "filename": "925s-three", "rotated": false, "trimmed": true, "sourceSize": { @@ -1446,20 +1593,146 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, + "x": 5, + "y": 8, + "w": 29, + "h": 20 + }, + "frame": { + "x": 122, + "y": 143, + "w": 29, + "h": 20 + } + }, + { + "filename": "976", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 10, + "w": 29, + "h": 18 + }, + "frame": { + "x": 151, + "y": 148, + "w": 29, + "h": 18 + } + }, + { + "filename": "976s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 5, + "y": 10, + "w": 29, + "h": 18 + }, + "frame": { + "x": 180, + "y": 148, + "w": 29, + "h": 18 + } + }, + { + "filename": "936", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 0, - "w": 28, + "w": 20, "h": 28 }, "frame": { - "x": 30, - "y": 138, - "w": 28, + "x": 50, + "y": 118, + "w": 20, "h": 28 } }, { - "filename": "994", + "filename": "936s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 20, + "h": 28 + }, + "frame": { + "x": 30, + "y": 120, + "w": 20, + "h": 28 + } + }, + { + "filename": "968", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 28 + }, + "frame": { + "x": 30, + "y": 148, + "w": 23, + "h": 28 + } + }, + { + "filename": "968s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 0, + "w": 23, + "h": 28 + }, + "frame": { + "x": 30, + "y": 176, + "w": 23, + "h": 28 + } + }, + { + "filename": "982-three-segment", "rotated": false, "trimmed": true, "sourceSize": { @@ -1469,18 +1742,18 @@ "spriteSourceSize": { "x": 8, "y": 1, - "w": 27, + "w": 25, "h": 28 }, "frame": { "x": 30, - "y": 166, - "w": 27, + "y": 204, + "w": 25, "h": 28 } }, { - "filename": "994s", + "filename": "982s-three-segment", "rotated": false, "trimmed": true, "sourceSize": { @@ -1490,13 +1763,13 @@ "spriteSourceSize": { "x": 8, "y": 1, - "w": 27, + "w": 25, "h": 28 }, "frame": { "x": 30, - "y": 194, - "w": 27, + "y": 232, + "w": 25, "h": 28 } }, @@ -1516,7 +1789,7 @@ }, "frame": { "x": 30, - "y": 222, + "y": 260, "w": 26, "h": 28 } @@ -1537,13 +1810,13 @@ }, "frame": { "x": 30, - "y": 250, + "y": 288, "w": 26, "h": 28 } }, { - "filename": "956", + "filename": "994s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1551,268 +1824,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 + "x": 8, + "y": 1, + "w": 27, + "h": 28 }, "frame": { "x": 30, - "y": 278, - "w": 26, - "h": 22 - } - }, - { - "filename": "936", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 20, + "y": 316, + "w": 27, "h": 28 - }, - "frame": { - "x": 50, - "y": 300, - "w": 20, - "h": 28 - } - }, - { - "filename": "936s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 0, - "w": 20, - "h": 28 - }, - "frame": { - "x": 58, - "y": 138, - "w": 20, - "h": 28 - } - }, - { - "filename": "968s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 0, - "w": 23, - "h": 28 - }, - "frame": { - "x": 57, - "y": 166, - "w": 23, - "h": 28 - } - }, - { - "filename": "982-three-segment", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 28 - }, - "frame": { - "x": 57, - "y": 194, - "w": 25, - "h": 28 - } - }, - { - "filename": "982s-three-segment", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 28 - }, - "frame": { - "x": 56, - "y": 222, - "w": 25, - "h": 28 - } - }, - { - "filename": "989", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 1, - "w": 25, - "h": 27 - }, - "frame": { - "x": 56, - "y": 250, - "w": 25, - "h": 27 - } - }, - { - "filename": "911", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 56, - "y": 277, - "w": 28, - "h": 23 - } - }, - { - "filename": "1023", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 28 - }, - "frame": { - "x": 70, - "y": 300, - "w": 20, - "h": 28 - } - }, - { - "filename": "925s-three", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 8, - "w": 29, - "h": 20 - }, - "frame": { - "x": 60, - "y": 118, - "w": 29, - "h": 20 - } - }, - { - "filename": "1022s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 29, - "h": 25 - }, - "frame": { - "x": 89, - "y": 117, - "w": 29, - "h": 25 - } - }, - { - "filename": "8128-blaze", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 29, - "h": 27 - }, - "frame": { - "x": 118, - "y": 117, - "w": 29, - "h": 27 - } - }, - { - "filename": "8128s-blaze", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 29, - "h": 27 - }, - "frame": { - "x": 147, - "y": 123, - "w": 29, - "h": 27 } }, { @@ -1830,14 +1851,98 @@ "h": 26 }, "frame": { - "x": 176, - "y": 123, + "x": 30, + "y": 344, "w": 27, "h": 26 } }, { - "filename": "911s", + "filename": "953", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 12, + "w": 24, + "h": 16 + }, + "frame": { + "x": 30, + "y": 370, + "w": 24, + "h": 16 + } + }, + { + "filename": "913", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 53, + "y": 146, + "w": 17, + "h": 23 + } + }, + { + "filename": "961s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 70, + "y": 153, + "w": 23, + "h": 23 + } + }, + { + "filename": "913s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 53, + "y": 169, + "w": 17, + "h": 23 + } + }, + { + "filename": "1022s", "rotated": false, "trimmed": true, "sourceSize": { @@ -1846,57 +1951,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 5, - "w": 28, - "h": 23 + "y": 3, + "w": 29, + "h": 25 }, "frame": { - "x": 203, - "y": 127, - "w": 28, - "h": 23 - } - }, - { - "filename": "1010", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 2, - "w": 21, - "h": 26 - }, - "frame": { - "x": 231, - "y": 138, - "w": 21, - "h": 26 - } - }, - { - "filename": "8128-aqua", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 78, - "y": 142, - "w": 28, - "h": 24 + "x": 93, + "y": 163, + "w": 29, + "h": 25 } }, { @@ -1914,12 +1977,306 @@ "h": 26 }, "frame": { - "x": 80, - "y": 166, + "x": 122, + "y": 163, "w": 27, "h": 26 } }, + { + "filename": "986", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 70, + "y": 176, + "w": 23, + "h": 23 + } + }, + { + "filename": "990", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 149, + "y": 166, + "w": 28, + "h": 23 + } + }, + { + "filename": "990s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 28, + "h": 23 + }, + "frame": { + "x": 177, + "y": 166, + "w": 28, + "h": 23 + } + }, + { + "filename": "950", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 11, + "w": 28, + "h": 17 + }, + "frame": { + "x": 93, + "y": 188, + "w": 28, + "h": 17 + } + }, + { + "filename": "950s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 11, + "w": 28, + "h": 17 + }, + "frame": { + "x": 121, + "y": 189, + "w": 28, + "h": 17 + } + }, + { + "filename": "8128-aqua", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 28, + "h": 24 + }, + "frame": { + "x": 149, + "y": 189, + "w": 28, + "h": 24 + } + }, + { + "filename": "8128s-aqua", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 5, + "w": 28, + "h": 24 + }, + "frame": { + "x": 177, + "y": 189, + "w": 28, + "h": 24 + } + }, + { + "filename": "973", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 55, + "y": 192, + "w": 15, + "h": 26 + } + }, + { + "filename": "986s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 70, + "y": 199, + "w": 23, + "h": 23 + } + }, + { + "filename": "973s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 2, + "w": 15, + "h": 26 + }, + "frame": { + "x": 55, + "y": 218, + "w": 15, + "h": 26 + } + }, + { + "filename": "914", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 70, + "y": 222, + "w": 24, + "h": 25 + } + }, + { + "filename": "953s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 12, + "w": 24, + "h": 16 + }, + "frame": { + "x": 93, + "y": 205, + "w": 24, + "h": 16 + } + }, + { + "filename": "989", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 25, + "h": 27 + }, + "frame": { + "x": 94, + "y": 221, + "w": 25, + "h": 27 + } + }, + { + "filename": "963", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 13, + "w": 22, + "h": 15 + }, + "frame": { + "x": 117, + "y": 206, + "w": 22, + "h": 15 + } + }, { "filename": "989s", "rotated": false, @@ -1935,33 +2292,12 @@ "h": 27 }, "frame": { - "x": 82, - "y": 192, + "x": 119, + "y": 221, "w": 25, "h": 27 } }, - { - "filename": "972", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 106, - "y": 144, - "w": 27, - "h": 22 - } - }, { "filename": "998", "rotated": false, @@ -1977,8 +2313,8 @@ "h": 26 }, "frame": { - "x": 107, - "y": 166, + "x": 144, + "y": 213, "w": 25, "h": 26 } @@ -1998,117 +2334,12 @@ "h": 26 }, "frame": { - "x": 107, - "y": 192, + "x": 169, + "y": 213, "w": 25, "h": 26 } }, - { - "filename": "935", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 13, - "h": 21 - }, - "frame": { - "x": 133, - "y": 144, - "w": 13, - "h": 21 - } - }, - { - "filename": "976", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 5, - "y": 10, - "w": 29, - "h": 18 - }, - "frame": { - "x": 146, - "y": 150, - "w": 29, - "h": 18 - } - }, - { - "filename": "8128s-aqua", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 5, - "w": 28, - "h": 24 - }, - "frame": { - "x": 132, - "y": 168, - "w": 28, - "h": 24 - } - }, - { - "filename": "990", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 132, - "y": 192, - "w": 28, - "h": 23 - } - }, - { - "filename": "1023s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 1, - "w": 20, - "h": 28 - }, - "frame": { - "x": 160, - "y": 168, - "w": 20, - "h": 28 - } - }, { "filename": "908s", "rotated": false, @@ -2124,14 +2355,14 @@ "h": 26 }, "frame": { - "x": 160, - "y": 196, + "x": 194, + "y": 213, "w": 20, "h": 26 } }, { - "filename": "950", + "filename": "972", "rotated": false, "trimmed": true, "sourceSize": { @@ -2140,19 +2371,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 11, - "w": 28, - "h": 17 + "y": 6, + "w": 27, + "h": 22 }, "frame": { - "x": 132, - "y": 215, - "w": 28, - "h": 17 + "x": 144, + "y": 239, + "w": 27, + "h": 22 } }, { - "filename": "916-female", + "filename": "972s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2161,19 +2392,19 @@ }, "spriteSourceSize": { "x": 6, - "y": 7, - "w": 25, - "h": 21 + "y": 6, + "w": 27, + "h": 22 }, "frame": { - "x": 107, - "y": 218, - "w": 25, - "h": 21 + "x": 171, + "y": 239, + "w": 27, + "h": 22 } }, { - "filename": "916s-female", + "filename": "907", "rotated": false, "trimmed": true, "sourceSize": { @@ -2181,20 +2412,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 25, - "h": 21 + "x": 11, + "y": 6, + "w": 17, + "h": 22 }, "frame": { - "x": 82, - "y": 219, - "w": 25, - "h": 21 + "x": 198, + "y": 239, + "w": 17, + "h": 22 } }, { - "filename": "1016", + "filename": "996", "rotated": false, "trimmed": true, "sourceSize": { @@ -2202,16 +2433,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 12, + "y": 12, + "w": 15, + "h": 16 + }, + "frame": { + "x": 55, + "y": 244, + "w": 15, + "h": 16 + } + }, + { + "filename": "1023", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 1, - "w": 24, - "h": 27 + "w": 20, + "h": 28 }, "frame": { - "x": 81, - "y": 240, - "w": 24, - "h": 27 + "x": 56, + "y": 260, + "w": 20, + "h": 28 + } + }, + { + "filename": "1023s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 1, + "w": 20, + "h": 28 + }, + "frame": { + "x": 56, + "y": 288, + "w": 20, + "h": 28 } }, { @@ -2229,8 +2502,8 @@ "h": 27 }, "frame": { - "x": 84, - "y": 267, + "x": 57, + "y": 316, "w": 22, "h": 27 } @@ -2250,14 +2523,14 @@ "h": 27 }, "frame": { - "x": 90, - "y": 294, + "x": 57, + "y": 343, "w": 22, "h": 27 } }, { - "filename": "950s", + "filename": "916-female", "rotated": false, "trimmed": true, "sourceSize": { @@ -2266,15 +2539,36 @@ }, "spriteSourceSize": { "x": 6, - "y": 11, - "w": 28, - "h": 17 + "y": 7, + "w": 25, + "h": 21 }, "frame": { - "x": 132, - "y": 232, - "w": 28, - "h": 17 + "x": 54, + "y": 370, + "w": 25, + "h": 21 + } + }, + { + "filename": "914s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 3, + "w": 24, + "h": 25 + }, + "frame": { + "x": 50, + "y": 391, + "w": 24, + "h": 25 } }, { @@ -2292,35 +2586,14 @@ "h": 27 }, "frame": { - "x": 160, - "y": 222, + "x": 205, + "y": 166, "w": 22, "h": 27 } }, { - "filename": "916", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 9, - "w": 25, - "h": 19 - }, - "frame": { - "x": 107, - "y": 239, - "w": 25, - "h": 19 - } - }, - { - "filename": "1016s", + "filename": "943", "rotated": false, "trimmed": true, "sourceSize": { @@ -2329,19 +2602,40 @@ }, "spriteSourceSize": { "x": 8, + "y": 8, + "w": 24, + "h": 20 + }, + "frame": { + "x": 205, + "y": 193, + "w": 24, + "h": 20 + } + }, + { + "filename": "1006s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, "y": 1, - "w": 24, + "w": 22, "h": 27 }, "frame": { - "x": 106, - "y": 258, - "w": 24, + "x": 227, + "y": 115, + "w": 22, "h": 27 } }, { - "filename": "976s", + "filename": "982", "rotated": false, "trimmed": true, "sourceSize": { @@ -2349,41 +2643,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 5, - "y": 10, - "w": 29, - "h": 18 + "x": 10, + "y": 2, + "w": 22, + "h": 26 }, "frame": { - "x": 132, - "y": 249, - "w": 29, - "h": 18 + "x": 227, + "y": 142, + "w": 22, + "h": 26 } }, { - "filename": "990s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 28, - "h": 23 - }, - "frame": { - "x": 130, - "y": 267, - "w": 28, - "h": 23 - } - }, - { - "filename": "910", + "filename": "918", "rotated": false, "trimmed": true, "sourceSize": { @@ -2392,19 +2665,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 7, - "w": 21, - "h": 21 + "y": 4, + "w": 22, + "h": 24 }, "frame": { - "x": 161, - "y": 249, - "w": 21, - "h": 21 + "x": 227, + "y": 168, + "w": 22, + "h": 24 } }, { - "filename": "914", + "filename": "949", "rotated": false, "trimmed": true, "sourceSize": { @@ -2412,15 +2685,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, + "x": 10, "y": 3, - "w": 24, + "w": 20, "h": 25 }, "frame": { - "x": 158, - "y": 270, - "w": 24, + "x": 229, + "y": 192, + "w": 20, "h": 25 } }, @@ -2439,33 +2712,12 @@ "h": 19 }, "frame": { - "x": 112, - "y": 285, + "x": 209, + "y": 126, "w": 18, "h": 19 } }, - { - "filename": "972s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 27, - "h": 22 - }, - "frame": { - "x": 130, - "y": 290, - "w": 27, - "h": 22 - } - }, { "filename": "906s", "rotated": false, @@ -2481,14 +2733,14 @@ "h": 19 }, "frame": { - "x": 112, - "y": 304, + "x": 209, + "y": 145, "w": 18, "h": 19 } }, { - "filename": "916s", + "filename": "912", "rotated": false, "trimmed": true, "sourceSize": { @@ -2496,209 +2748,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, + "x": 13, "y": 9, - "w": 25, + "w": 15, "h": 19 }, "frame": { - "x": 157, - "y": 295, - "w": 25, + "x": 214, + "y": 213, + "w": 15, "h": 19 } }, { - "filename": "985", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 27, - "h": 21 - }, - "frame": { - "x": 130, - "y": 312, - "w": 27, - "h": 21 - } - }, - { - "filename": "933", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 157, - "y": 314, - "w": 25, - "h": 21 - } - }, - { - "filename": "917", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 6, - "w": 22, - "h": 22 - }, - "frame": { - "x": 90, - "y": 321, - "w": 22, - "h": 22 - } - }, - { - "filename": "909", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 112, - "y": 323, - "w": 18, - "h": 19 - } - }, - { - "filename": "985s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 27, - "h": 21 - }, - "frame": { - "x": 130, - "y": 333, - "w": 27, - "h": 21 - } - }, - { - "filename": "933s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 157, - "y": 335, - "w": 25, - "h": 21 - } - }, - { - "filename": "907", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 73, - "y": 328, - "w": 17, - "h": 22 - } - }, - { - "filename": "947", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 50, - "y": 328, - "w": 23, - "h": 22 - } - }, - { - "filename": "914s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 3, - "w": 24, - "h": 25 - }, - "frame": { - "x": 49, - "y": 350, - "w": 24, - "h": 25 - } - }, - { - "filename": "1006s", + "filename": "949s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2707,19 +2770,124 @@ }, "spriteSourceSize": { "x": 10, + "y": 3, + "w": 20, + "h": 25 + }, + "frame": { + "x": 229, + "y": 217, + "w": 20, + "h": 25 + } + }, + { + "filename": "999-roaming", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 215, + "y": 232, + "w": 14, + "h": 18 + } + }, + { + "filename": "991", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 229, + "y": 242, + "w": 20, + "h": 24 + } + }, + { + "filename": "999s-roaming", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 14, + "h": 18 + }, + "frame": { + "x": 215, + "y": 250, + "w": 14, + "h": 18 + } + }, + { + "filename": "991s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 229, + "y": 266, + "w": 20, + "h": 24 + } + }, + { + "filename": "1016", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, "y": 1, - "w": 22, + "w": 24, "h": 27 }, "frame": { - "x": 49, - "y": 375, - "w": 22, + "x": 70, + "y": 416, + "w": 24, "h": 27 } }, { - "filename": "949", + "filename": "962", "rotated": false, "trimmed": true, "sourceSize": { @@ -2729,56 +2897,35 @@ "spriteSourceSize": { "x": 10, "y": 3, - "w": 20, + "w": 19, "h": 25 }, + "frame": { + "x": 74, + "y": 391, + "w": 19, + "h": 25 + } + }, + { + "filename": "1016s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 1, + "w": 24, + "h": 27 + }, "frame": { "x": 73, - "y": 350, - "w": 20, - "h": 25 - } - }, - { - "filename": "982", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 2, - "w": 22, - "h": 26 - }, - "frame": { - "x": 71, - "y": 375, - "w": 22, - "h": 26 - } - }, - { - "filename": "963", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 15 - }, - "frame": { - "x": 49, - "y": 402, - "w": 22, - "h": 15 + "y": 443, + "w": 24, + "h": 27 } }, { @@ -2796,12 +2943,33 @@ "h": 26 }, "frame": { - "x": 50, - "y": 417, + "x": 76, + "y": 470, "w": 22, "h": 26 } }, + { + "filename": "1010", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 2, + "w": 21, + "h": 26 + }, + "frame": { + "x": 76, + "y": 496, + "w": 21, + "h": 26 + } + }, { "filename": "1010s", "rotated": false, @@ -2817,14 +2985,14 @@ "h": 26 }, "frame": { - "x": 50, - "y": 443, + "x": 77, + "y": 522, "w": 21, "h": 26 } }, { - "filename": "949s", + "filename": "962s", "rotated": false, "trimmed": true, "sourceSize": { @@ -2834,16 +3002,79 @@ "spriteSourceSize": { "x": 10, "y": 3, - "w": 20, + "w": 19, "h": 25 }, "frame": { - "x": 51, - "y": 469, - "w": 20, + "x": 80, + "y": 548, + "w": 19, "h": 25 } }, + { + "filename": "940", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 14, + "w": 17, + "h": 14 + }, + "frame": { + "x": 80, + "y": 573, + "w": 17, + "h": 14 + } + }, + { + "filename": "920", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 86, + "y": 587, + "w": 22, + "h": 23 + } + }, + { + "filename": "969", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 16, + "w": 18, + "h": 12 + }, + "frame": { + "x": 70, + "y": 247, + "w": 18, + "h": 12 + } + }, { "filename": "918s", "rotated": false, @@ -2859,8 +3090,8 @@ "h": 24 }, "frame": { - "x": 51, - "y": 494, + "x": 76, + "y": 259, "w": 22, "h": 24 } @@ -2880,390 +3111,12 @@ "h": 24 }, "frame": { - "x": 51, - "y": 518, + "x": 76, + "y": 283, "w": 24, "h": 24 } }, - { - "filename": "940", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 14, - "w": 17, - "h": 14 - }, - "frame": { - "x": 51, - "y": 542, - "w": 17, - "h": 14 - } - }, - { - "filename": "953", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 12, - "w": 24, - "h": 16 - }, - "frame": { - "x": 71, - "y": 401, - "w": 24, - "h": 16 - } - }, - { - "filename": "987s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 72, - "y": 417, - "w": 24, - "h": 24 - } - }, - { - "filename": "962", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 93, - "y": 343, - "w": 19, - "h": 25 - } - }, - { - "filename": "909s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 - }, - "frame": { - "x": 112, - "y": 342, - "w": 18, - "h": 19 - } - }, - { - "filename": "962s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 3, - "w": 19, - "h": 25 - }, - "frame": { - "x": 93, - "y": 368, - "w": 19, - "h": 25 - } - }, - { - "filename": "923", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 24 - }, - "frame": { - "x": 112, - "y": 361, - "w": 19, - "h": 24 - } - }, - { - "filename": "956s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 131, - "y": 354, - "w": 26, - "h": 22 - } - }, - { - "filename": "945", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 157, - "y": 356, - "w": 25, - "h": 22 - } - }, - { - "filename": "1012-counterfeit", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 131, - "y": 376, - "w": 26, - "h": 22 - } - }, - { - "filename": "945s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 157, - "y": 378, - "w": 25, - "h": 22 - } - }, - { - "filename": "915", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 11, - "w": 19, - "h": 17 - }, - "frame": { - "x": 112, - "y": 385, - "w": 19, - "h": 17 - } - }, - { - "filename": "913", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 95, - "y": 393, - "w": 17, - "h": 23 - } - }, - { - "filename": "923s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 19, - "h": 24 - }, - "frame": { - "x": 96, - "y": 416, - "w": 19, - "h": 24 - } - }, - { - "filename": "940s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 14, - "w": 17, - "h": 14 - }, - "frame": { - "x": 112, - "y": 402, - "w": 17, - "h": 14 - } - }, - { - "filename": "973", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 15, - "h": 26 - }, - "frame": { - "x": 115, - "y": 416, - "w": 15, - "h": 26 - } - }, - { - "filename": "1012s-counterfeit", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 26, - "h": 22 - }, - "frame": { - "x": 131, - "y": 398, - "w": 26, - "h": 22 - } - }, - { - "filename": "1002", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 27, - "h": 21 - }, - "frame": { - "x": 130, - "y": 420, - "w": 27, - "h": 21 - } - }, { "filename": "1017-hearthflame-mask", "rotated": false, @@ -3279,14 +3132,14 @@ "h": 24 }, "frame": { - "x": 157, - "y": 400, + "x": 98, + "y": 248, "w": 25, "h": 24 } }, { - "filename": "1017s-hearthflame-mask", + "filename": "910", "rotated": false, "trimmed": true, "sourceSize": { @@ -3294,62 +3147,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 25, - "h": 24 - }, - "frame": { - "x": 157, - "y": 400, - "w": 25, - "h": 24 - } - }, - { - "filename": "952", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 - }, - "frame": { - "x": 157, - "y": 424, - "w": 25, - "h": 22 - } - }, - { - "filename": "1002s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 6, + "x": 9, "y": 7, - "w": 27, + "w": 21, "h": 21 }, "frame": { - "x": 130, - "y": 441, - "w": 27, + "x": 123, + "y": 248, + "w": 21, "h": 21 } }, { - "filename": "952s", + "filename": "987s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3357,79 +3168,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 25, - "h": 22 + "x": 10, + "y": 4, + "w": 24, + "h": 24 }, "frame": { - "x": 157, - "y": 446, - "w": 25, - "h": 22 - } - }, - { - "filename": "938", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 12, - "w": 11, - "h": 16 - }, - "frame": { - "x": 62, - "y": 86, - "w": 11, - "h": 16 - } - }, - { - "filename": "938s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 14, - "y": 12, - "w": 11, - "h": 16 - }, - "frame": { - "x": 61, - "y": 102, - "w": 11, - "h": 16 - } - }, - { - "filename": "961", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 180, - "y": 149, - "w": 23, - "h": 23 + "x": 79, + "y": 307, + "w": 24, + "h": 24 } }, { @@ -3447,29 +3195,8 @@ "h": 24 }, "frame": { - "x": 180, - "y": 172, - "w": 24, - "h": 24 - } - }, - { - "filename": "1017s-cornerstone-mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 180, - "y": 172, + "x": 79, + "y": 331, "w": 24, "h": 24 } @@ -3489,8 +3216,155 @@ "h": 24 }, "frame": { - "x": 180, - "y": 196, + "x": 79, + "y": 355, + "w": 24, + "h": 24 + } + }, + { + "filename": "969s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 16, + "w": 18, + "h": 12 + }, + "frame": { + "x": 79, + "y": 379, + "w": 18, + "h": 12 + } + }, + { + "filename": "1017-wellspring-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 100, + "y": 272, + "w": 24, + "h": 24 + } + }, + { + "filename": "1013-unremarkable", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 124, + "y": 269, + "w": 20, + "h": 24 + } + }, + { + "filename": "1017s-hearthflame-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 25, + "h": 24 + }, + "frame": { + "x": 144, + "y": 261, + "w": 25, + "h": 24 + } + }, + { + "filename": "956", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 26, + "h": 22 + }, + "frame": { + "x": 169, + "y": 261, + "w": 26, + "h": 22 + } + }, + { + "filename": "1013s-unremarkable", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 4, + "w": 20, + "h": 24 + }, + "frame": { + "x": 195, + "y": 261, + "w": 20, + "h": 24 + } + }, + { + "filename": "1017s-cornerstone-mask", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 24, + "h": 24 + }, + "frame": { + "x": 103, + "y": 296, "w": 24, "h": 24 } @@ -3510,50 +3384,8 @@ "h": 24 }, "frame": { - "x": 180, - "y": 196, - "w": 24, - "h": 24 - } - }, - { - "filename": "947s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 6, - "w": 23, - "h": 22 - }, - "frame": { - "x": 203, - "y": 150, - "w": 23, - "h": 22 - } - }, - { - "filename": "1017-wellspring-mask", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 24, - "h": 24 - }, - "frame": { - "x": 204, - "y": 172, + "x": 103, + "y": 320, "w": 24, "h": 24 } @@ -3573,14 +3405,14 @@ "h": 24 }, "frame": { - "x": 204, - "y": 172, + "x": 103, + "y": 344, "w": 24, "h": 24 } }, { - "filename": "927", + "filename": "923", "rotated": false, "trimmed": true, "sourceSize": { @@ -3588,20 +3420,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 21 + "x": 10, + "y": 4, + "w": 19, + "h": 24 }, "frame": { - "x": 228, - "y": 164, - "w": 24, - "h": 21 + "x": 127, + "y": 293, + "w": 19, + "h": 24 } }, { - "filename": "927s", + "filename": "923s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3609,121 +3441,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 7, - "w": 24, - "h": 21 + "x": 10, + "y": 4, + "w": 19, + "h": 24 }, "frame": { - "x": 228, - "y": 185, - "w": 24, - "h": 21 - } - }, - { - "filename": "943", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 20 - }, - "frame": { - "x": 204, - "y": 196, - "w": 24, - "h": 20 - } - }, - { - "filename": "943s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 20 - }, - "frame": { - "x": 228, - "y": 206, - "w": 24, - "h": 20 - } - }, - { - "filename": "920", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 182, - "y": 220, - "w": 22, - "h": 23 - } - }, - { - "filename": "1024", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 20 - }, - "frame": { - "x": 204, - "y": 216, - "w": 24, - "h": 20 - } - }, - { - "filename": "1024s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 24, - "h": 20 - }, - "frame": { - "x": 228, - "y": 226, - "w": 24, - "h": 20 + "x": 127, + "y": 317, + "w": 19, + "h": 24 } }, { @@ -3741,14 +3468,56 @@ "h": 23 }, "frame": { - "x": 182, - "y": 243, + "x": 127, + "y": 341, "w": 22, "h": 23 } }, { - "filename": "953s", + "filename": "945", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 146, + "y": 285, + "w": 25, + "h": 22 + } + }, + { + "filename": "945s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 146, + "y": 307, + "w": 25, + "h": 22 + } + }, + { + "filename": "927", "rotated": false, "trimmed": true, "sourceSize": { @@ -3757,19 +3526,19 @@ }, "spriteSourceSize": { "x": 8, - "y": 12, + "y": 7, "w": 24, - "h": 16 + "h": 21 }, "frame": { - "x": 204, - "y": 236, + "x": 171, + "y": 283, "w": 24, - "h": 16 + "h": 21 } }, { - "filename": "961s", + "filename": "952", "rotated": false, "trimmed": true, "sourceSize": { @@ -3777,20 +3546,83 @@ "h": 30 }, "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 23, - "h": 23 + "x": 7, + "y": 6, + "w": 25, + "h": 22 }, "frame": { - "x": 182, - "y": 266, - "w": 23, - "h": 23 + "x": 171, + "y": 304, + "w": 25, + "h": 22 } }, { - "filename": "986", + "filename": "916", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 9, + "w": 25, + "h": 19 + }, + "frame": { + "x": 195, + "y": 285, + "w": 25, + "h": 19 + } + }, + { + "filename": "952s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 25, + "h": 22 + }, + "frame": { + "x": 196, + "y": 304, + "w": 25, + "h": 22 + } + }, + { + "filename": "916s-female", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 103, + "y": 368, + "w": 25, + "h": 21 + } + }, + { + "filename": "917", "rotated": false, "trimmed": true, "sourceSize": { @@ -3799,36 +3631,15 @@ }, "spriteSourceSize": { "x": 9, - "y": 5, - "w": 23, - "h": 23 + "y": 6, + "w": 22, + "h": 22 }, "frame": { - "x": 182, - "y": 289, - "w": 23, - "h": 23 - } - }, - { - "filename": "986s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 182, - "y": 312, - "w": 23, - "h": 23 + "x": 128, + "y": 364, + "w": 22, + "h": 22 } }, { @@ -3846,14 +3657,14 @@ "h": 22 }, "frame": { - "x": 182, - "y": 335, + "x": 149, + "y": 329, "w": 22, "h": 22 } }, { - "filename": "991", + "filename": "956s", "rotated": false, "trimmed": true, "sourceSize": { @@ -3861,20 +3672,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, - "h": 24 + "x": 7, + "y": 6, + "w": 26, + "h": 22 }, "frame": { - "x": 182, - "y": 357, - "w": 20, - "h": 24 + "x": 171, + "y": 326, + "w": 26, + "h": 22 } }, { - "filename": "991s", + "filename": "1012-counterfeit", "rotated": false, "trimmed": true, "sourceSize": { @@ -3882,20 +3693,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 4, - "w": 20, - "h": 24 + "x": 7, + "y": 6, + "w": 26, + "h": 22 }, "frame": { - "x": 182, - "y": 381, - "w": 20, - "h": 24 + "x": 197, + "y": 326, + "w": 26, + "h": 22 } }, { - "filename": "1013-unremarkable", + "filename": "1012s-counterfeit", "rotated": false, "trimmed": true, "sourceSize": { @@ -3903,20 +3714,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 20, - "h": 24 + "x": 7, + "y": 6, + "w": 26, + "h": 22 }, "frame": { - "x": 182, - "y": 405, - "w": 20, - "h": 24 + "x": 223, + "y": 290, + "w": 26, + "h": 22 } }, { - "filename": "1013s-unremarkable", + "filename": "933", "rotated": false, "trimmed": true, "sourceSize": { @@ -3924,16 +3735,79 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 4, - "w": 20, - "h": 24 + "x": 7, + "y": 7, + "w": 25, + "h": 21 }, "frame": { - "x": 182, - "y": 429, - "w": 20, - "h": 24 + "x": 223, + "y": 312, + "w": 25, + "h": 21 + } + }, + { + "filename": "916s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 9, + "w": 25, + "h": 19 + }, + "frame": { + "x": 223, + "y": 333, + "w": 25, + "h": 19 + } + }, + { + "filename": "985", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 171, + "y": 348, + "w": 27, + "h": 21 + } + }, + { + "filename": "933s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 25, + "h": 21 + }, + "frame": { + "x": 198, + "y": 348, + "w": 25, + "h": 21 } }, { @@ -3951,8 +3825,8 @@ "h": 21 }, "frame": { - "x": 182, - "y": 453, + "x": 150, + "y": 351, "w": 21, "h": 21 } @@ -3972,12 +3846,96 @@ "h": 21 }, "frame": { - "x": 205, - "y": 252, + "x": 223, + "y": 352, "w": 25, "h": 21 } }, + { + "filename": "927s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 7, + "w": 24, + "h": 21 + }, + "frame": { + "x": 150, + "y": 372, + "w": 24, + "h": 21 + } + }, + { + "filename": "985s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 174, + "y": 369, + "w": 27, + "h": 21 + } + }, + { + "filename": "941", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 201, + "y": 369, + "w": 21, + "h": 21 + } + }, + { + "filename": "1002", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 222, + "y": 373, + "w": 27, + "h": 21 + } + }, { "filename": "963s", "rotated": false, @@ -3993,12 +3951,117 @@ "h": 15 }, "frame": { - "x": 230, - "y": 246, + "x": 128, + "y": 386, "w": 22, "h": 15 } }, + { + "filename": "931-blue-plumage", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 20, + "h": 20 + }, + "frame": { + "x": 108, + "y": 389, + "w": 20, + "h": 20 + } + }, + { + "filename": "912s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 9, + "w": 15, + "h": 19 + }, + "frame": { + "x": 93, + "y": 391, + "w": 15, + "h": 19 + } + }, + { + "filename": "943s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 24, + "h": 20 + }, + "frame": { + "x": 150, + "y": 393, + "w": 24, + "h": 20 + } + }, + { + "filename": "1002s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 27, + "h": 21 + }, + "frame": { + "x": 174, + "y": 390, + "w": 27, + "h": 21 + } + }, + { + "filename": "941s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 7, + "w": 21, + "h": 21 + }, + "frame": { + "x": 201, + "y": 390, + "w": 21, + "h": 21 + } + }, { "filename": "964-zero", "rotated": false, @@ -4014,8 +4077,8 @@ "h": 15 }, "frame": { - "x": 230, - "y": 261, + "x": 128, + "y": 401, "w": 22, "h": 15 } @@ -4035,12 +4098,54 @@ "h": 21 }, "frame": { - "x": 205, - "y": 273, + "x": 222, + "y": 394, "w": 25, "h": 21 } }, + { + "filename": "907s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 94, + "y": 410, + "w": 17, + "h": 22 + } + }, + { + "filename": "929", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 6, + "w": 17, + "h": 22 + }, + "frame": { + "x": 111, + "y": 409, + "w": 17, + "h": 22 + } + }, { "filename": "964s-zero", "rotated": false, @@ -4056,12 +4161,33 @@ "h": 15 }, "frame": { - "x": 230, - "y": 276, + "x": 128, + "y": 416, "w": 22, "h": 15 } }, + { + "filename": "1024", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 24, + "h": 20 + }, + "frame": { + "x": 150, + "y": 413, + "w": 24, + "h": 20 + } + }, { "filename": "8128", "rotated": false, @@ -4077,138 +4203,12 @@ "h": 21 }, "frame": { - "x": 205, - "y": 294, + "x": 174, + "y": 411, "w": 25, "h": 21 } }, - { - "filename": "974", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 15 - }, - "frame": { - "x": 230, - "y": 291, - "w": 22, - "h": 15 - } - }, - { - "filename": "974s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 13, - "w": 22, - "h": 15 - }, - "frame": { - "x": 230, - "y": 306, - "w": 22, - "h": 15 - } - }, - { - "filename": "8128s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 25, - "h": 21 - }, - "frame": { - "x": 205, - "y": 315, - "w": 25, - "h": 21 - } - }, - { - "filename": "980", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 10, - "w": 22, - "h": 15 - }, - "frame": { - "x": 230, - "y": 321, - "w": 22, - "h": 15 - } - }, - { - "filename": "941", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 204, - "y": 336, - "w": 21, - "h": 21 - } - }, - { - "filename": "941s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 7, - "w": 21, - "h": 21 - }, - "frame": { - "x": 202, - "y": 357, - "w": 21, - "h": 21 - } - }, { "filename": "939", "rotated": false, @@ -4224,434 +4224,14 @@ "h": 21 }, "frame": { - "x": 225, - "y": 336, + "x": 199, + "y": 411, "w": 20, "h": 21 } }, { - "filename": "939s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 202, - "y": 378, - "w": 20, - "h": 21 - } - }, - { - "filename": "971", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 223, - "y": 357, - "w": 20, - "h": 21 - } - }, - { - "filename": "971s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 7, - "w": 20, - "h": 21 - }, - "frame": { - "x": 202, - "y": 399, - "w": 20, - "h": 21 - } - }, - { - "filename": "973s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 15, - "h": 26 - }, - "frame": { - "x": 222, - "y": 378, - "w": 15, - "h": 26 - } - }, - { - "filename": "912", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 237, - "y": 378, - "w": 15, - "h": 19 - } - }, - { - "filename": "912s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 9, - "w": 15, - "h": 19 - }, - "frame": { - "x": 237, - "y": 397, - "w": 15, - "h": 19 - } - }, - { - "filename": "960", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 222, - "y": 404, - "w": 15, - "h": 18 - } - }, - { - "filename": "931-blue-plumage", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 20, - "h": 20 - }, - "frame": { - "x": 202, - "y": 420, - "w": 20, - "h": 20 - } - }, - { - "filename": "960s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 15, - "h": 18 - }, - "frame": { - "x": 237, - "y": 416, - "w": 15, - "h": 18 - } - }, - { - "filename": "996", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 15, - "h": 16 - }, - "frame": { - "x": 222, - "y": 422, - "w": 15, - "h": 16 - } - }, - { - "filename": "996s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 12, - "w": 15, - "h": 16 - }, - "frame": { - "x": 237, - "y": 434, - "w": 15, - "h": 16 - } - }, - { - "filename": "969", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 16, - "w": 18, - "h": 12 - }, - "frame": { - "x": 202, - "y": 440, - "w": 18, - "h": 12 - } - }, - { - "filename": "907s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 203, - "y": 452, - "w": 17, - "h": 22 - } - }, - { - "filename": "913s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 220, - "y": 440, - "w": 17, - "h": 23 - } - }, - { - "filename": "978-curly", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 237, - "y": 450, - "w": 15, - "h": 14 - } - }, - { - "filename": "922", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 9, - "w": 17, - "h": 19 - }, - "frame": { - "x": 220, - "y": 463, - "w": 17, - "h": 19 - } - }, - { - "filename": "978-droopy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 237, - "y": 464, - "w": 15, - "h": 14 - } - }, - { - "filename": "978-stretchy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 237, - "y": 478, - "w": 15, - "h": 14 - } - }, - { - "filename": "978s-curly", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 68, - "y": 542, - "w": 15, - "h": 14 - } - }, - { - "filename": "929", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 6, - "w": 17, - "h": 22 - }, - "frame": { - "x": 73, - "y": 556, - "w": 17, - "h": 22 - } - }, - { - "filename": "980s", + "filename": "8128s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4660,19 +4240,19 @@ }, "spriteSourceSize": { "x": 9, - "y": 10, - "w": 22, - "h": 15 + "y": 7, + "w": 25, + "h": 21 }, "frame": { - "x": 72, - "y": 441, - "w": 22, - "h": 15 + "x": 219, + "y": 415, + "w": 25, + "h": 21 } }, { - "filename": "1004", + "filename": "938", "rotated": false, "trimmed": true, "sourceSize": { @@ -4680,20 +4260,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 21, - "h": 20 + "x": 14, + "y": 12, + "w": 11, + "h": 16 }, "frame": { - "x": 71, - "y": 456, - "w": 21, - "h": 20 + "x": 215, + "y": 268, + "w": 11, + "h": 16 } }, { - "filename": "915s", + "filename": "940s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4702,15 +4282,15 @@ }, "spriteSourceSize": { "x": 11, - "y": 11, - "w": 19, - "h": 17 + "y": 14, + "w": 17, + "h": 14 }, "frame": { - "x": 71, - "y": 476, - "w": 19, - "h": 17 + "x": 97, + "y": 573, + "w": 17, + "h": 14 } }, { @@ -4728,8 +4308,8 @@ "h": 22 }, "frame": { - "x": 73, - "y": 493, + "x": 108, + "y": 587, "w": 17, "h": 22 } @@ -4749,14 +4329,14 @@ "h": 22 }, "frame": { - "x": 75, - "y": 515, + "x": 97, + "y": 432, "w": 19, "h": 22 } }, { - "filename": "922s", + "filename": "1024s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4764,18 +4344,207 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, + "x": 8, + "y": 8, + "w": 24, + "h": 20 + }, + "frame": { + "x": 116, + "y": 431, + "w": 24, + "h": 20 + } + }, + { + "filename": "946", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 97, + "y": 454, + "w": 19, + "h": 16 + } + }, + { + "filename": "997", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, "y": 9, - "w": 17, + "w": 21, "h": 19 }, "frame": { - "x": 83, - "y": 537, - "w": 17, + "x": 116, + "y": 451, + "w": 21, "h": 19 } }, + { + "filename": "939s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 98, + "y": 470, + "w": 20, + "h": 21 + } + }, + { + "filename": "971", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 118, + "y": 470, + "w": 20, + "h": 21 + } + }, + { + "filename": "997s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 9, + "w": 21, + "h": 19 + }, + "frame": { + "x": 140, + "y": 433, + "w": 21, + "h": 19 + } + }, + { + "filename": "974", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 13, + "w": 22, + "h": 15 + }, + "frame": { + "x": 137, + "y": 452, + "w": 22, + "h": 15 + } + }, + { + "filename": "971s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 7, + "w": 20, + "h": 21 + }, + "frame": { + "x": 138, + "y": 467, + "w": 20, + "h": 21 + } + }, + { + "filename": "909", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 18, + "h": 19 + }, + "frame": { + "x": 161, + "y": 433, + "w": 18, + "h": 19 + } + }, + { + "filename": "1004", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 21, + "h": 20 + }, + "frame": { + "x": 179, + "y": 432, + "w": 21, + "h": 20 + } + }, { "filename": "1011s", "rotated": false, @@ -4791,8 +4560,8 @@ "h": 22 }, "frame": { - "x": 90, - "y": 556, + "x": 200, + "y": 432, "w": 19, "h": 22 } @@ -4812,14 +4581,14 @@ "h": 20 }, "frame": { - "x": 109, - "y": 442, + "x": 219, + "y": 436, "w": 21, "h": 20 } }, { - "filename": "935s", + "filename": "974s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4827,36 +4596,15 @@ "h": 30 }, "spriteSourceSize": { - "x": 13, - "y": 7, - "w": 13, - "h": 21 - }, - "frame": { - "x": 96, - "y": 440, - "w": 13, - "h": 21 - } - }, - { - "filename": "926", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, + "x": 9, "y": 13, - "w": 17, + "w": 22, "h": 15 }, "frame": { - "x": 92, - "y": 461, - "w": 17, + "x": 159, + "y": 452, + "w": 22, "h": 15 } }, @@ -4875,14 +4623,14 @@ "h": 20 }, "frame": { - "x": 90, - "y": 476, + "x": 158, + "y": 467, "w": 20, "h": 20 } }, { - "filename": "967", + "filename": "915", "rotated": false, "trimmed": true, "sourceSize": { @@ -4890,20 +4638,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 9, - "w": 20, - "h": 19 + "x": 11, + "y": 11, + "w": 19, + "h": 17 }, "frame": { - "x": 90, - "y": 496, - "w": 20, - "h": 19 + "x": 181, + "y": 452, + "w": 19, + "h": 17 } }, { - "filename": "948", + "filename": "915s", "rotated": false, "trimmed": true, "sourceSize": { @@ -4911,16 +4659,58 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 16, - "h": 21 + "x": 11, + "y": 11, + "w": 19, + "h": 17 }, "frame": { - "x": 94, - "y": 515, - "w": 16, - "h": 21 + "x": 200, + "y": 454, + "w": 19, + "h": 17 + } + }, + { + "filename": "980", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 22, + "h": 15 + }, + "frame": { + "x": 219, + "y": 456, + "w": 22, + "h": 15 + } + }, + { + "filename": "980s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 9, + "y": 10, + "w": 22, + "h": 15 + }, + "frame": { + "x": 178, + "y": 469, + "w": 22, + "h": 15 } }, { @@ -4938,75 +4728,12 @@ "h": 20 }, "frame": { - "x": 100, - "y": 536, + "x": 200, + "y": 471, "w": 20, "h": 20 } }, - { - "filename": "948s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 7, - "w": 16, - "h": 21 - }, - "frame": { - "x": 109, - "y": 556, - "w": 16, - "h": 21 - } - }, - { - "filename": "969s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 16, - "w": 18, - "h": 12 - }, - "frame": { - "x": 109, - "y": 462, - "w": 18, - "h": 12 - } - }, - { - "filename": "1015", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 110, - "y": 474, - "w": 17, - "h": 21 - } - }, { "filename": "931-yellow-plumage", "rotated": false, @@ -5022,33 +4749,12 @@ "h": 20 }, "frame": { - "x": 127, - "y": 462, + "x": 220, + "y": 471, "w": 20, "h": 20 } }, - { - "filename": "1015s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 7, - "w": 17, - "h": 21 - }, - "frame": { - "x": 110, - "y": 495, - "w": 17, - "h": 21 - } - }, { "filename": "931s-blue-plumage", "rotated": false, @@ -5064,8 +4770,8 @@ "h": 20 }, "frame": { - "x": 110, - "y": 516, + "x": 98, + "y": 491, "w": 20, "h": 20 } @@ -5085,8 +4791,8 @@ "h": 20 }, "frame": { - "x": 127, - "y": 482, + "x": 118, + "y": 491, "w": 20, "h": 20 } @@ -5106,8 +4812,8 @@ "h": 20 }, "frame": { - "x": 120, - "y": 536, + "x": 138, + "y": 488, "w": 20, "h": 20 } @@ -5127,14 +4833,14 @@ "h": 20 }, "frame": { - "x": 125, - "y": 556, + "x": 158, + "y": 487, "w": 20, "h": 20 } }, { - "filename": "978s-droopy", + "filename": "967", "rotated": false, "trimmed": true, "sourceSize": { @@ -5142,165 +4848,18 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 127, - "y": 502, - "w": 15, - "h": 14 - } - }, - { - "filename": "951", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 130, - "y": 516, - "w": 16, - "h": 20 - } - }, - { - "filename": "951s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 8, - "w": 16, - "h": 20 - }, - "frame": { - "x": 140, - "y": 536, - "w": 16, - "h": 20 - } - }, - { - "filename": "958", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 145, - "y": 556, - "w": 17, - "h": 20 - } - }, - { - "filename": "997", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, + "x": 10, "y": 9, - "w": 21, + "w": 20, "h": 19 }, "frame": { - "x": 147, - "y": 468, - "w": 21, + "x": 178, + "y": 484, + "w": 20, "h": 19 } }, - { - "filename": "997s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 9, - "y": 9, - "w": 21, - "h": 19 - }, - "frame": { - "x": 147, - "y": 487, - "w": 21, - "h": 19 - } - }, - { - "filename": "928", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 - }, - "frame": { - "x": 168, - "y": 468, - "w": 13, - "h": 18 - } - }, - { - "filename": "958s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 11, - "y": 8, - "w": 17, - "h": 20 - }, - "frame": { - "x": 168, - "y": 486, - "w": 17, - "h": 20 - } - }, { "filename": "967s", "rotated": false, @@ -5316,14 +4875,14 @@ "h": 19 }, "frame": { - "x": 146, - "y": 506, + "x": 198, + "y": 491, "w": 20, "h": 19 } }, { - "filename": "932", + "filename": "909s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5337,14 +4896,14 @@ "h": 19 }, "frame": { - "x": 166, - "y": 506, + "x": 218, + "y": 491, "w": 18, "h": 19 } }, { - "filename": "932s", + "filename": "935", "rotated": false, "trimmed": true, "sourceSize": { @@ -5352,37 +4911,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 11, - "y": 9, - "w": 18, - "h": 19 + "x": 13, + "y": 7, + "w": 13, + "h": 21 }, "frame": { - "x": 156, - "y": 525, - "w": 18, - "h": 19 - } - }, - { - "filename": "921", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 16, - "h": 18 - }, - "frame": { - "x": 174, - "y": 525, - "w": 16, - "h": 18 + "x": 236, + "y": 491, + "w": 13, + "h": 21 } }, { @@ -5400,33 +4938,12 @@ "h": 16 }, "frame": { - "x": 185, - "y": 474, + "x": 178, + "y": 503, "w": 20, "h": 16 } }, - { - "filename": "978s-stretchy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 15, - "h": 14 - }, - "frame": { - "x": 205, - "y": 474, - "w": 15, - "h": 14 - } - }, { "filename": "970s", "rotated": false, @@ -5442,138 +4959,12 @@ "h": 16 }, "frame": { - "x": 185, - "y": 490, + "x": 158, + "y": 507, "w": 20, "h": 16 } }, - { - "filename": "946", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 184, - "y": 506, - "w": 19, - "h": 16 - } - }, - { - "filename": "921s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 16, - "h": 18 - }, - "frame": { - "x": 205, - "y": 488, - "w": 16, - "h": 18 - } - }, - { - "filename": "957", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 - }, - "frame": { - "x": 221, - "y": 482, - "w": 16, - "h": 17 - } - }, - { - "filename": "946s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 203, - "y": 506, - "w": 19, - "h": 16 - } - }, - { - "filename": "965", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 10, - "y": 12, - "w": 19, - "h": 16 - }, - "frame": { - "x": 190, - "y": 522, - "w": 19, - "h": 16 - } - }, - { - "filename": "928s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 13, - "y": 10, - "w": 13, - "h": 18 - }, - "frame": { - "x": 209, - "y": 522, - "w": 13, - "h": 18 - } - }, { "filename": "942", "rotated": false, @@ -5589,54 +4980,12 @@ "h": 15 }, "frame": { - "x": 190, - "y": 538, + "x": 198, + "y": 510, "w": 19, "h": 15 } }, - { - "filename": "919", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 16, - "h": 15 - }, - "frame": { - "x": 174, - "y": 543, - "w": 16, - "h": 15 - } - }, - { - "filename": "919s", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 40, - "h": 30 - }, - "spriteSourceSize": { - "x": 12, - "y": 13, - "w": 16, - "h": 15 - }, - "frame": { - "x": 209, - "y": 540, - "w": 16, - "h": 15 - } - }, { "filename": "942s", "rotated": false, @@ -5652,14 +5001,35 @@ "h": 15 }, "frame": { - "x": 190, - "y": 553, + "x": 217, + "y": 510, "w": 19, "h": 15 } }, { - "filename": "926s", + "filename": "935s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 7, + "w": 13, + "h": 21 + }, + "frame": { + "x": 236, + "y": 512, + "w": 13, + "h": 21 + } + }, + { + "filename": "1015", "rotated": false, "trimmed": true, "sourceSize": { @@ -5668,19 +5038,19 @@ }, "spriteSourceSize": { "x": 11, - "y": 13, + "y": 7, "w": 17, - "h": 15 + "h": 21 }, "frame": { - "x": 209, - "y": 555, + "x": 98, + "y": 511, "w": 17, - "h": 15 + "h": 21 } }, { - "filename": "957s", + "filename": "1015s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5688,20 +5058,20 @@ "h": 30 }, "spriteSourceSize": { - "x": 12, - "y": 11, - "w": 16, - "h": 17 + "x": 11, + "y": 7, + "w": 17, + "h": 21 }, "frame": { - "x": 222, - "y": 499, - "w": 16, - "h": 17 + "x": 115, + "y": 511, + "w": 17, + "h": 21 } }, { - "filename": "8194", + "filename": "946s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5710,15 +5080,246 @@ }, "spriteSourceSize": { "x": 10, - "y": 11, - "w": 18, - "h": 17 + "y": 12, + "w": 19, + "h": 16 }, "frame": { - "x": 222, - "y": 516, + "x": 98, + "y": 532, + "w": 19, + "h": 16 + } + }, + { + "filename": "932", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, "w": 18, - "h": 17 + "h": 19 + }, + "frame": { + "x": 99, + "y": 548, + "w": 18, + "h": 19 + } + }, + { + "filename": "948", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 117, + "y": 532, + "w": 16, + "h": 21 + } + }, + { + "filename": "919", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 16, + "h": 15 + }, + "frame": { + "x": 117, + "y": 553, + "w": 16, + "h": 15 + } + }, + { + "filename": "932s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 9, + "w": 18, + "h": 19 + }, + "frame": { + "x": 114, + "y": 568, + "w": 18, + "h": 19 + } + }, + { + "filename": "948s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 7, + "w": 16, + "h": 21 + }, + "frame": { + "x": 132, + "y": 511, + "w": 16, + "h": 21 + } + }, + { + "filename": "951", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 133, + "y": 532, + "w": 16, + "h": 20 + } + }, + { + "filename": "921", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 16, + "h": 18 + }, + "frame": { + "x": 133, + "y": 552, + "w": 16, + "h": 18 + } + }, + { + "filename": "922", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 132, + "y": 570, + "w": 17, + "h": 19 + } + }, + { + "filename": "958", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 125, + "y": 589, + "w": 17, + "h": 20 + } + }, + { + "filename": "951s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 8, + "w": 16, + "h": 20 + }, + "frame": { + "x": 142, + "y": 589, + "w": 16, + "h": 20 + } + }, + { + "filename": "965", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 12, + "w": 19, + "h": 16 + }, + "frame": { + "x": 178, + "y": 519, + "w": 19, + "h": 16 } }, { @@ -5736,12 +5337,180 @@ "h": 16 }, "frame": { - "x": 162, - "y": 570, + "x": 197, + "y": 525, "w": 19, "h": 16 } }, + { + "filename": "8194", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 216, + "y": 525, + "w": 18, + "h": 17 + } + }, + { + "filename": "960", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 234, + "y": 533, + "w": 15, + "h": 18 + } + }, + { + "filename": "958s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 8, + "w": 17, + "h": 20 + }, + "frame": { + "x": 149, + "y": 535, + "w": 17, + "h": 20 + } + }, + { + "filename": "922s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 9, + "w": 17, + "h": 19 + }, + "frame": { + "x": 149, + "y": 555, + "w": 17, + "h": 19 + } + }, + { + "filename": "926", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 17, + "h": 15 + }, + "frame": { + "x": 149, + "y": 574, + "w": 17, + "h": 15 + } + }, + { + "filename": "921s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 16, + "h": 18 + }, + "frame": { + "x": 158, + "y": 589, + "w": 16, + "h": 18 + } + }, + { + "filename": "8194s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 18, + "h": 17 + }, + "frame": { + "x": 166, + "y": 535, + "w": 18, + "h": 17 + } + }, + { + "filename": "928", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 184, + "y": 535, + "w": 13, + "h": 18 + } + }, { "filename": "955", "rotated": false, @@ -5757,8 +5526,8 @@ "h": 16 }, "frame": { - "x": 181, - "y": 570, + "x": 166, + "y": 552, "w": 17, "h": 16 } @@ -5778,12 +5547,138 @@ "h": 16 }, "frame": { - "x": 198, - "y": 570, + "x": 166, + "y": 568, "w": 17, "h": 16 } }, + { + "filename": "960s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 15, + "h": 18 + }, + "frame": { + "x": 183, + "y": 553, + "w": 15, + "h": 18 + } + }, + { + "filename": "919s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 13, + "w": 16, + "h": 15 + }, + "frame": { + "x": 183, + "y": 571, + "w": 16, + "h": 15 + } + }, + { + "filename": "957", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 174, + "y": 586, + "w": 16, + "h": 17 + } + }, + { + "filename": "928s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 13, + "y": 10, + "w": 13, + "h": 18 + }, + "frame": { + "x": 190, + "y": 586, + "w": 13, + "h": 18 + } + }, + { + "filename": "957s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 11, + "w": 16, + "h": 17 + }, + "frame": { + "x": 198, + "y": 541, + "w": 16, + "h": 17 + } + }, + { + "filename": "926s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 11, + "y": 13, + "w": 17, + "h": 15 + }, + "frame": { + "x": 214, + "y": 542, + "w": 17, + "h": 15 + } + }, { "filename": "944", "rotated": false, @@ -5799,14 +5694,14 @@ "h": 15 }, "frame": { - "x": 215, - "y": 570, + "x": 231, + "y": 551, "w": 16, "h": 15 } }, { - "filename": "8194s", + "filename": "996s", "rotated": false, "trimmed": true, "sourceSize": { @@ -5814,16 +5709,16 @@ "h": 30 }, "spriteSourceSize": { - "x": 10, - "y": 11, - "w": 18, - "h": 17 + "x": 12, + "y": 12, + "w": 15, + "h": 16 }, "frame": { - "x": 225, - "y": 533, - "w": 18, - "h": 17 + "x": 199, + "y": 558, + "w": 15, + "h": 16 } }, { @@ -5841,11 +5736,158 @@ "h": 15 }, "frame": { - "x": 226, - "y": 550, + "x": 214, + "y": 557, "w": 16, "h": 15 } + }, + { + "filename": "978-curly", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 230, + "y": 566, + "w": 15, + "h": 14 + } + }, + { + "filename": "978-droopy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 214, + "y": 572, + "w": 15, + "h": 14 + } + }, + { + "filename": "938s", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 14, + "y": 12, + "w": 11, + "h": 16 + }, + "frame": { + "x": 203, + "y": 574, + "w": 11, + "h": 16 + } + }, + { + "filename": "978-stretchy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 203, + "y": 590, + "w": 15, + "h": 14 + } + }, + { + "filename": "978s-curly", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 218, + "y": 586, + "w": 15, + "h": 14 + } + }, + { + "filename": "978s-droopy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 233, + "y": 580, + "w": 15, + "h": 14 + } + }, + { + "filename": "978s-stretchy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 40, + "h": 30 + }, + "spriteSourceSize": { + "x": 12, + "y": 14, + "w": 15, + "h": 14 + }, + "frame": { + "x": 233, + "y": 594, + "w": 15, + "h": 14 + } } ] } @@ -5853,6 +5895,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:cdc0f0a6b89cd3ead4955a027fc473f6:f817aad54d161aa2798d7499e09174ef:6fb417eff82c0971c86b4818772ba292$" + "smartupdate": "$TexturePacker:SmartUpdate:f977ce4f0ed0e03a872bb2f028f431c7:d06bbeb26cad484f351da5562acaa5ac:6fb417eff82c0971c86b4818772ba292$" } } diff --git a/public/images/ui/pokemon_icons_9.png b/public/images/ui/pokemon_icons_9.png index b09714d36..71e0e9666 100644 Binary files a/public/images/ui/pokemon_icons_9.png and b/public/images/ui/pokemon_icons_9.png differ diff --git a/src/data/biomes.ts b/src/data/biomes.ts index 06076a764..da5b242b1 100644 --- a/src/data/biomes.ts +++ b/src/data/biomes.ts @@ -383,7 +383,7 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.TOEDSCOOL ], 30: [ Species.TOEDSCRUEL ] } ] }, - [BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DURANT ] }, + [BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [ Species.BLOODMOON_URSALUNA ], [TimeOfDay.ALL]: [ Species.DURANT ] }, [BiomePoolTier.ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.KARTANA, Species.WO_CHIEN ] }, [BiomePoolTier.BOSS]: { [TimeOfDay.DAWN]: [ Species.VICTREEBEL, Species.MOTHIM, Species.VESPIQUEN, Species.LILLIGANT, Species.SAWSBUCK ], @@ -396,7 +396,7 @@ export const biomePokemonPools: BiomePokemonPools = { [TimeOfDay.DAWN]: [ Species.STANTLER ], [TimeOfDay.DAY]: [ Species.STANTLER ], [TimeOfDay.DUSK]: [], - [TimeOfDay.NIGHT]: [ Species.LYCANROC ], + [TimeOfDay.NIGHT]: [ Species.LYCANROC, Species.BLOODMOON_URSALUNA ], [TimeOfDay.ALL]: [ Species.HERACROSS, Species.SCEPTILE, Species.ESCAVALIER, Species.ACCELGOR, Species.DURANT, Species.CHESNAUGHT, Species.DECIDUEYE, Species.TOEDSCRUEL ] }, [BiomePoolTier.BOSS_SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.KARTANA, Species.WO_CHIEN ] }, @@ -478,8 +478,8 @@ export const biomePokemonPools: BiomePokemonPools = { [TimeOfDay.ALL]: [ { 1: [ Species.TOTODILE ], 18: [ Species.CROCONAW ], 30: [ Species.FERALIGATR ] }, { 1: [ Species.MUDKIP ], 16: [ Species.MARSHTOMP ], 36: [ Species.SWAMPERT ] } ] }, [BiomePoolTier.SUPER_RARE]: { - [TimeOfDay.DAWN]: [ { 1: [ Species.GALAR_SLOWPOKE ], 37: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], - [TimeOfDay.DAY]: [ { 1: [ Species.GALAR_SLOWPOKE ], 37: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], + [TimeOfDay.DAWN]: [ { 1: [ Species.GALAR_SLOWPOKE ], 40: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], + [TimeOfDay.DAY]: [ { 1: [ Species.GALAR_SLOWPOKE ], 40: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.POLITOED, Species.GALAR_STUNFISK ] @@ -1405,7 +1405,7 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.HATENNA ], 32: [ Species.HATTREM ], 42: [ Species.HATTERENE ] } ] }, - [BiomePoolTier.RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.AUDINO ] }, + [BiomePoolTier.RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.AUDINO, Species.ETERNAL_FLOETTE ] }, [BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [] }, [BiomePoolTier.ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DIANCIE, Species.ENAMORUS ] }, [BiomePoolTier.BOSS]: { @@ -1415,7 +1415,7 @@ export const biomePokemonPools: BiomePokemonPools = { [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.WIGGLYTUFF, Species.MAWILE, Species.TOGEKISS, Species.AUDINO, Species.AROMATISSE, Species.SLURPUFF, Species.CARBINK, Species.RIBOMBEE, Species.SHIINOTIC, Species.COMFEY, Species.HATTERENE, Species.ALCREMIE ] }, - [BiomePoolTier.BOSS_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [] }, + [BiomePoolTier.BOSS_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.ETERNAL_FLOETTE ] }, [BiomePoolTier.BOSS_SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DIANCIE, Species.ENAMORUS ] }, [BiomePoolTier.BOSS_ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.XERNEAS ] } }, @@ -6944,6 +6944,11 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ] ] ] ], + [ Species.ETERNAL_FLOETTE, Type.FAIRY, -1, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.RARE ], + [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_RARE ] + ] + ], [ Species.GALAR_MEOWTH, Type.STEEL, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ] ] @@ -7101,6 +7106,11 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ Species.PALDEA_WOOPER, Type.POISON, Type.GROUND, [ [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ] ] ] + ], + [ Species.BLOODMOON_URSALUNA, Type.GROUND, Type.NORMAL, [ + [ Biome.FOREST, BiomePoolTier.SUPER_RARE, TimeOfDay.NIGHT ], + [ Biome.FOREST, BiomePoolTier.BOSS_RARE, TimeOfDay.NIGHT ] + ] ] ]; diff --git a/src/data/enums/species.ts b/src/data/enums/species.ts index dd16bc8d1..3fcf97760 100644 --- a/src/data/enums/species.ts +++ b/src/data/enums/species.ts @@ -1024,6 +1024,7 @@ export enum Species { IRON_CROWN, TERAPAGOS, PECHARUNT, + ETERNAL_FLOETTE = 2670, ALOLA_RATTATA = 2019, ALOLA_RATICATE = 2020, ALOLA_RAICHU = 2026, @@ -1079,4 +1080,5 @@ export enum Species { HISUI_DECIDUEYE = 6724, PALDEA_TAUROS = 8128, PALDEA_WOOPER = 8194, + BLOODMOON_URSALUNA = 8901, }; \ No newline at end of file diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index dbaaa3eee..7c8b96b38 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -1445,8 +1445,8 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.CETITAN, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.MEDIUM) ], [Species.POLTCHAGEIST]: [ - new SpeciesFormEvolution(Species.SINISTCHA, 'counterfeit', 'unremarkable', 1, EvolutionItem.UNREMARKABLE_TEACUP, null, null), - new SpeciesFormEvolution(Species.SINISTCHA, 'artisan', 'masterpiece', 1, EvolutionItem.MASTERPIECE_TEACUP, null, null) + new SpeciesFormEvolution(Species.SINISTCHA, 'counterfeit', 'unremarkable', 1, EvolutionItem.UNREMARKABLE_TEACUP, null, SpeciesWildEvolutionDelay.LONG), + new SpeciesFormEvolution(Species.SINISTCHA, 'artisan', 'masterpiece', 1, EvolutionItem.MASTERPIECE_TEACUP, null, SpeciesWildEvolutionDelay.LONG) ], [Species.DIPPLIN]: [ new SpeciesEvolution(Species.HYDRAPPLE, 1, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.DRAGON_CHEER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG) diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts index 105c03847..c38aac21a 100644 --- a/src/data/pokemon-level-moves.ts +++ b/src/data/pokemon-level-moves.ts @@ -17362,6 +17362,23 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 54, Moves.THRASH ], [ 60, Moves.FLARE_BLITZ ], ], + [Species.ETERNAL_FLOETTE]: [ + [ 1, Moves.VINE_WHIP ], + [ 1, Moves.TACKLE ], + [ 1, Moves.FAIRY_WIND ], + [ 10, Moves.LUCKY_CHANT ], + [ 15, Moves.RAZOR_LEAF ], + [ 20, Moves.WISH ], + [ 25, Moves.MAGICAL_LEAF ], + [ 27, Moves.GRASSY_TERRAIN ], + [ 33, Moves.PETAL_BLIZZARD ], + [ 38, Moves.AROMATHERAPY ], + [ 43, Moves.MISTY_TERRAIN ], + [ 46, Moves.MOONBLAST ], + [ 50, Moves.LIGHT_OF_RUIN ], + [ 51, Moves.PETAL_DANCE ], + [ 58, Moves.SOLAR_BEAM ], + ], [Species.GALAR_MEOWTH]: [ [ 1, Moves.GROWL ], [ 1, Moves.FAKE_OUT ], @@ -18049,6 +18066,24 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 32, Moves.AMNESIA ], [ 36, Moves.TOXIC ], [ 40, Moves.EARTHQUAKE ], + ], + [Species.BLOODMOON_URSALUNA]: [ + [ 1, Moves.SCRATCH ], + [ 1, Moves.LEER ], + [ 1, Moves.LICK ], + [ 1, Moves.HEADLONG_RUSH ], + [ 8, Moves.FURY_SWIPES ], + [ 13, Moves.PAYBACK ], + [ 17, Moves.HARDEN ], + [ 22, Moves.SLASH ], + [ 25, Moves.PLAY_NICE ], + [ 35, Moves.SCARY_FACE ], + [ 41, Moves.REST ], + [ 41, Moves.SNORE ], + [ 48, Moves.EARTH_POWER ], + [ 56, Moves.MOONBLAST ], + [ 64, Moves.HAMMER_ARM ], + [ 70, Moves.BLOOD_MOON ], ] }; @@ -18219,25 +18254,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = { [ 59, Moves.FUTURE_SIGHT ], ], }, - [Species.FLOETTE]: { - 5: [ - [ 1, Moves.VINE_WHIP ], - [ 1, Moves.TACKLE ], - [ 1, Moves.FAIRY_WIND ], - [ 10, Moves.LUCKY_CHANT ], - [ 15, Moves.RAZOR_LEAF ], - [ 20, Moves.WISH ], - [ 25, Moves.MAGICAL_LEAF ], - [ 27, Moves.GRASSY_TERRAIN ], - [ 33, Moves.PETAL_BLIZZARD ], - [ 38, Moves.AROMATHERAPY ], - [ 43, Moves.MISTY_TERRAIN ], - [ 46, Moves.MOONBLAST ], - [ 50, Moves.LIGHT_OF_RUIN ], - [ 51, Moves.PETAL_DANCE ], - [ 58, Moves.SOLAR_BEAM ], - ], - }, [Species.HOOPA]: { 1: [ [ 1, Moves.CONFUSION ], diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 70cfcdef4..36b658f69 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -205,6 +205,10 @@ export abstract class PokemonSpeciesForm { switch (this.speciesId) { case Species.GALAR_SLOWPOKE: break; + case Species.ETERNAL_FLOETTE: + break; + case Species.BLOODMOON_URSALUNA: + break; default: speciesId = speciesId % 2000; break; @@ -232,7 +236,6 @@ export abstract class PokemonSpeciesForm { case 'droopy': case 'stretchy': case 'roaming': - case 'eternal': case 'complete': case '10': case 'super': @@ -1549,7 +1552,6 @@ export function initSpecies() { new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130), new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130), new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130), - new PokemonForm("Eternal", "eternal", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 130), ), new PokemonSpecies(Species.FLORGES, "Florges", 6, false, false, false, "Garden Pokémon", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, GrowthRate.MEDIUM_FAST, 0, false, false, new PokemonForm("Red Flower", "red", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248), @@ -1940,10 +1942,7 @@ export function initSpecies() { ), new PokemonSpecies(Species.WYRDEER, "Wyrdeer", 8, false, false, false, "Big Horn Pokémon", Type.NORMAL, Type.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.KLEAVOR, "Kleavor", 8, false, false, false, "Axe Pokémon", Type.BUG, Type.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), - new PokemonSpecies(Species.URSALUNA, "Ursaluna", 8, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Normal", "", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275), - new PokemonForm("Blood Moon", "bloodmoon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 275), - ), + new PokemonSpecies(Species.URSALUNA, "Ursaluna", 8, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.BASCULEGION, "Basculegion", 8, false, false, false, "Big Fish Pokémon", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonForm("Male", "male", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, ""), new PokemonForm("Female", "female", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265), @@ -2143,6 +2142,7 @@ export function initSpecies() { new PokemonSpecies(Species.ALOLA_MUK, "Muk", 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.ALOLA_EXEGGUTOR, "Exeggutor", 7, false, false, false, "Coconut Pokémon", Type.GRASS, Type.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.ALOLA_MAROWAK, "Marowak", 7, false, false, false, "Bone Keeper Pokémon", Type.FIRE, Type.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), + new PokemonSpecies(Species.ETERNAL_FLOETTE, "Floette", 6, false, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false), new PokemonSpecies(Species.GALAR_MEOWTH, "Meowth", 8, false, false, false, "Scratch Cat Pokémon", Type.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.GALAR_PONYTA, "Ponyta", 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.GALAR_RAPIDASH, "Rapidash", 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, Type.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), @@ -2187,6 +2187,7 @@ export function initSpecies() { new PokemonForm("Aqua Breed", "aqua", Type.FIGHTING, Type.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172), ), new PokemonSpecies(Species.PALDEA_WOOPER, "Wooper", 9, false, false, false, "Water Fish Pokémon", Type.POISON, Type.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true), + new PokemonSpecies(Species.BLOODMOON_URSALUNA, "Ursaluna", 9, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.7, 333, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false), ); } @@ -2563,6 +2564,7 @@ export const speciesStarters = { [Species.DIANCIE]: 7, [Species.HOOPA]: 7, [Species.VOLCANION]: 7, + [Species.ETERNAL_FLOETTE]: 5, [Species.ROWLET]: 3, [Species.LITTEN]: 3, @@ -2730,8 +2732,6 @@ export const speciesStarters = { [Species.VELUZA]: 4, [Species.DONDOZO]: 5, [Species.TATSUGIRI]: 5, - [Species.PALDEA_TAUROS]: 5, - [Species.PALDEA_WOOPER]: 3, [Species.GREAT_TUSK]: 6, [Species.SCREAM_TAIL]: 6, [Species.BRUTE_BONNET]: 6, @@ -2767,6 +2767,9 @@ export const speciesStarters = { [Species.IRON_CROWN]: 7, [Species.TERAPAGOS]: 8, [Species.PECHARUNT]: 7, + [Species.PALDEA_TAUROS]: 5, + [Species.PALDEA_WOOPER]: 3, + [Species.BLOODMOON_URSALUNA]: 7, }; // TODO: Remove diff --git a/src/data/tms.ts b/src/data/tms.ts index fde349180..fe7092bfa 100644 --- a/src/data/tms.ts +++ b/src/data/tms.ts @@ -495,6 +495,7 @@ export const tmSpecies: TmSpecies = { Species.GALAR_DARMANITAN, Species.HISUI_TYPHLOSION, Species.HISUI_GOODRA, + Species.BLOODMOON_URSALUNA, ], [Moves.ICE_PUNCH]: [ Species.SQUIRTLE, @@ -694,6 +695,7 @@ export const tmSpecies: TmSpecies = { Species.GALAR_SLOWKING, Species.GALAR_DARUMAKA, Species.GALAR_DARMANITAN, + Species.BLOODMOON_URSALUNA, ], [Moves.THUNDER_PUNCH]: [ Species.CHARMANDER, @@ -917,6 +919,7 @@ export const tmSpecies: TmSpecies = { Species.GALAR_SLOWKING, Species.HISUI_TYPHLOSION, Species.HISUI_GOODRA, + Species.BLOODMOON_URSALUNA, ], [Moves.SWORDS_DANCE]: [ Species.BULBASAUR, @@ -1216,6 +1219,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.HISUI_DECIDUEYE, + Species.BLOODMOON_URSALUNA, ], [Moves.FLY]: [ Species.CHARIZARD, @@ -2149,6 +2153,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.TAKE_DOWN]: [ Species.BULBASAUR, @@ -3336,6 +3341,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.PIN_MISSILE]: [ Species.BEEDRILL, @@ -3616,10 +3622,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_TYPHLOSION, Species.HISUI_ZORUA, Species.HISUI_ZOROARK, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.FLAMETHROWER]: [ Species.CHARMANDER, @@ -5582,6 +5585,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, ], [Moves.LOW_KICK]: [ Species.SANDSHREW, @@ -5806,6 +5810,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZOROARK, Species.HISUI_DECIDUEYE, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.SOLAR_BEAM]: [ Species.BULBASAUR, @@ -6041,7 +6046,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -6128,6 +6132,7 @@ export const tmSpecies: TmSpecies = { Species.OGERPON, Species.ALOLA_NINETALES, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_MR_MIME, Species.GALAR_DARUMAKA, Species.GALAR_DARMANITAN, @@ -7352,6 +7357,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.DIG]: [ Species.CHARMANDER, @@ -7781,6 +7787,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.TOXIC]: [ Species.BULBASAUR, @@ -8439,7 +8446,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -8614,6 +8620,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWBRO, Species.GALAR_WEEZING, Species.GALAR_SLOWKING, @@ -8797,7 +8804,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.ESPURR, @@ -8869,6 +8875,7 @@ export const tmSpecies: TmSpecies = { Species.MUNKIDORI, Species.ALOLA_RAICHU, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, Species.GALAR_SLOWPOKE, @@ -10170,7 +10177,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -10328,6 +10334,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_ARTICUNO, ], [Moves.CONFUSE_RAY]: [ @@ -10811,6 +10818,7 @@ export const tmSpecies: TmSpecies = { Species.FEZANDIPITI, Species.ALOLA_RAICHU, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, Species.GALAR_MR_MIME, @@ -11566,6 +11574,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GOLEM, Species.ALOLA_GRIMER, Species.ALOLA_MUK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_SLOWBRO, Species.GALAR_MR_MIME, @@ -12538,6 +12547,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GRIMER, Species.ALOLA_MUK, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, Species.GALAR_SLOWPOKE, @@ -12558,6 +12568,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY, Species.HISUI_DECIDUEYE, + Species.BLOODMOON_URSALUNA, ], [Moves.AMNESIA]: [ Species.BULBASAUR, @@ -13740,7 +13751,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -14099,6 +14109,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -14136,6 +14147,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.ROCK_SLIDE]: [ Species.CHARMANDER, @@ -14530,6 +14542,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.TRI_ATTACK]: [ Species.SPEAROW, @@ -15332,7 +15345,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -15693,6 +15705,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -15730,6 +15743,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.THIEF]: [ Species.BUTTERFREE, @@ -16208,6 +16222,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZORUA, Species.HISUI_ZOROARK, Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, ], [Moves.SNORE]: [ Species.BULBASAUR, @@ -16871,7 +16886,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -17115,6 +17129,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -18620,7 +18635,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -18983,6 +18997,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -19020,6 +19035,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.SCARY_FACE]: [ Species.CHARMANDER, @@ -19354,6 +19370,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, ], [Moves.SLUDGE_BOMB]: [ Species.BULBASAUR, @@ -21041,7 +21058,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -21113,6 +21129,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GRIMER, Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_CORSOLA, Species.HISUI_VOLTORB, Species.HISUI_ELECTRODE, @@ -22112,6 +22129,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -22149,6 +22167,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.CHARM]: [ Species.BULBASAUR, @@ -22372,6 +22391,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_DUGTRIO, Species.ALOLA_MEOWTH, Species.ALOLA_PERSIAN, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -23180,7 +23200,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -23350,6 +23369,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_SLOWKING, Species.PALDEA_TAUROS, @@ -24050,7 +24070,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -24248,6 +24267,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -24923,7 +24943,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -25282,6 +25301,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -25319,6 +25339,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.RETURN]: [ Species.BULBASAUR, @@ -25977,7 +25998,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -26131,6 +26151,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, ], [Moves.FRUSTRATION]: [ Species.BULBASAUR, @@ -26789,7 +26810,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -26943,6 +26963,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, ], [Moves.SAFEGUARD]: [ Species.BULBASAUR, @@ -27138,7 +27159,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.ESPURR, @@ -27219,6 +27239,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_SANDSLASH, Species.ALOLA_VULPIX, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, Species.GALAR_MR_MIME, @@ -27604,6 +27625,7 @@ export const tmSpecies: TmSpecies = { Species.MUNKIDORI, Species.ALOLA_VULPIX, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, Species.GALAR_RAPIDASH, Species.GALAR_MR_MIME, [ @@ -28236,6 +28258,7 @@ export const tmSpecies: TmSpecies = { Species.GALAR_STUNFISK, Species.HISUI_SNEASEL, Species.HISUI_BRAVIARY, + Species.BLOODMOON_URSALUNA, ], [Moves.HIDDEN_POWER]: [ Species.BULBASAUR, @@ -28896,7 +28919,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -29050,6 +29072,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, ], [Moves.RAIN_DANCE]: [ Species.SQUIRTLE, @@ -29115,6 +29138,7 @@ export const tmSpecies: TmSpecies = { Species.KINGLER, Species.VOLTORB, Species.ELECTRODE, + Species.MAROWAK, Species.HITMONLEE, Species.HITMONCHAN, Species.LICKITUNG, @@ -29560,7 +29584,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -29753,7 +29776,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GRIMER, Species.ALOLA_MUK, Species.ALOLA_MAROWAK, - Species.MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, @@ -29787,6 +29810,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.SUNNY_DAY]: [ Species.BULBASAUR, @@ -30268,7 +30292,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -30477,6 +30500,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, @@ -30506,6 +30530,7 @@ export const tmSpecies: TmSpecies = { 'combat', 'blaze', ], + Species.BLOODMOON_URSALUNA, ], [Moves.CRUNCH]: [ Species.CHARMANDER, @@ -30745,6 +30770,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_QWILFISH, Species.HISUI_ZOROARK, Species.HISUI_AVALUGG, + Species.BLOODMOON_URSALUNA, ], [Moves.PSYCH_UP]: [ Species.BUTTERFREE, @@ -32003,10 +32029,7 @@ export const tmSpecies: TmSpecies = { 'ice', 'shadow', ], - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.HEAT_WAVE]: [ Species.CHARMANDER, @@ -33362,7 +33385,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -33709,6 +33731,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -33746,6 +33769,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.FOCUS_PUNCH]: [ Species.CHARMANDER, @@ -33983,10 +34007,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZORUA, Species.HISUI_ZOROARK, Species.HISUI_DECIDUEYE, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.NATURE_POWER]: [ Species.BULBASAUR, @@ -34094,7 +34115,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -34134,6 +34154,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GRAVELER, Species.ALOLA_GOLEM, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_CORSOLA, ], [Moves.CHARGE]: [ @@ -34590,6 +34611,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZORUA, Species.HISUI_ZOROARK, Species.HISUI_DECIDUEYE, + Species.BLOODMOON_URSALUNA, ], [Moves.HELPING_HAND]: [ Species.BULBASAUR, @@ -34970,7 +34992,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -35136,6 +35157,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_PERSIAN, Species.ALOLA_GRIMER, Species.ALOLA_MUK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, @@ -35154,6 +35176,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_BRAVIARY, Species.HISUI_DECIDUEYE, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.TRICK]: [ Species.CLEFAIRY, @@ -35320,6 +35343,7 @@ export const tmSpecies: TmSpecies = { Species.GHOLDENGO, Species.IRON_VALIANT, Species.MUNKIDORI, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, Species.GALAR_MR_MIME, @@ -36004,6 +36028,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_LILLIGANT, Species.HISUI_ZOROARK, Species.HISUI_DECIDUEYE, + Species.BLOODMOON_URSALUNA, ], [Moves.KNOCK_OFF]: [ Species.BULBASAUR, @@ -36639,6 +36664,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MEOWTH, Species.ALOLA_PERSIAN, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_ZAPDOS, Species.HISUI_TYPHLOSION, @@ -36792,6 +36818,7 @@ export const tmSpecies: TmSpecies = { Species.IRON_VALIANT, Species.ALOLA_RAICHU, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, Species.GALAR_MR_MIME, @@ -37393,6 +37420,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ARCANINE, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY, + Species.BLOODMOON_URSALUNA, ], [Moves.BLAST_BURN]: [ Species.CHARIZARD, @@ -38336,6 +38364,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.METAL_SOUND]: [ Species.MAGNEMITE, @@ -40056,10 +40085,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_SLIGGOO, Species.HISUI_GOODRA, Species.PALDEA_WOOPER, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.POISON_TAIL]: [ Species.EKANS, @@ -40185,7 +40211,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -40243,6 +40268,7 @@ export const tmSpecies: TmSpecies = { 'female', ], Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.HISUI_LILLIGANT, Species.HISUI_DECIDUEYE, ], @@ -40401,7 +40427,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.ESPURR, @@ -40479,6 +40504,7 @@ export const tmSpecies: TmSpecies = { Species.FEZANDIPITI, Species.ALOLA_RAICHU, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, Species.GALAR_SLOWPOKE, @@ -40493,10 +40519,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZORUA, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.LEAF_BLADE]: [ Species.VICTREEBEL, @@ -43035,6 +43058,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_SAMUROTT, Species.HISUI_ZORUA, Species.HISUI_ZOROARK, + Species.BLOODMOON_URSALUNA, ], [Moves.POWER_SWAP]: [ Species.VULPIX, @@ -44043,7 +44067,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -44115,6 +44138,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MEOWTH, Species.ALOLA_PERSIAN, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_ZIGZAGOON, Species.GALAR_LINOONE, @@ -44122,6 +44146,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ELECTRODE, Species.HISUI_LILLIGANT, Species.HISUI_DECIDUEYE, + Species.BLOODMOON_URSALUNA, ], [Moves.AIR_SLASH]: [ Species.CHARIZARD, @@ -44853,6 +44878,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_SAMUROTT, Species.HISUI_LILLIGANT, Species.HISUI_BRAVIARY, + Species.BLOODMOON_URSALUNA, ], [Moves.FOCUS_BLAST]: [ Species.CHARMANDER, @@ -45088,10 +45114,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_SNEASEL, Species.HISUI_ZOROARK, Species.HISUI_DECIDUEYE, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.ENERGY_BALL]: [ Species.BULBASAUR, @@ -45258,7 +45281,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -45345,6 +45367,7 @@ export const tmSpecies: TmSpecies = { Species.SINISTCHA, Species.OGERPON, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_MR_MIME, Species.GALAR_YAMASK, Species.HISUI_VOLTORB, @@ -45626,6 +45649,7 @@ export const tmSpecies: TmSpecies = { Species.GALAR_YAMASK, Species.GALAR_STUNFISK, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.GIGA_IMPACT]: [ Species.VENUSAUR, @@ -46225,6 +46249,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, ], [Moves.NASTY_PLOT]: [ Species.PIKACHU, @@ -46515,6 +46540,7 @@ export const tmSpecies: TmSpecies = { ], Species.HISUI_SAMUROTT, Species.HISUI_AVALUGG, + Species.BLOODMOON_URSALUNA, ], [Moves.SHADOW_CLAW]: [ Species.CHARMANDER, @@ -46730,6 +46756,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY, Species.HISUI_DECIDUEYE, + Species.BLOODMOON_URSALUNA, ], [Moves.THUNDER_FANG]: [ Species.ARBOK, @@ -48121,6 +48148,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_QWILFISH, Species.HISUI_SNEASEL, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.IRON_HEAD]: [ Species.ARCANINE, @@ -48587,6 +48615,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.STEALTH_ROCK]: [ Species.SANDSHREW, @@ -49049,7 +49078,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -49144,6 +49172,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_RATICATE, Species.ALOLA_RAICHU, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, Species.GALAR_MR_MIME, @@ -50248,10 +50277,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_GROWLITHE, Species.HISUI_ARCANINE, Species.HISUI_DECIDUEYE, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.SLUDGE_WAVE]: [ Species.EKANS, @@ -50454,6 +50480,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_SLIGGOO, Species.HISUI_GOODRA, Species.HISUI_AVALUGG, + Species.BLOODMOON_URSALUNA, ], [Moves.ELECTRO_BALL]: [ Species.PIKACHU, @@ -51699,7 +51726,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -51945,6 +51971,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -52141,7 +52168,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.PANCHAM, @@ -52200,6 +52226,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_PERSIAN, Species.ALOLA_GOLEM, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, ], [Moves.STORED_POWER]: [ Species.CLEFAIRY, @@ -52338,6 +52365,7 @@ export const tmSpecies: TmSpecies = { ], Species.ALOLA_RAICHU, Species.ALOLA_VULPIX, + Species.ETERNAL_FLOETTE, Species.ALOLA_NINETALES, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, @@ -52367,6 +52395,7 @@ export const tmSpecies: TmSpecies = { Species.HYPNO, Species.KRABBY, Species.KINGLER, + Species.MAROWAK, Species.CHANSEY, Species.STARMIE, Species.MR_MIME, @@ -52470,7 +52499,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.ESPURR, @@ -52526,7 +52554,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GRAVELER, Species.ALOLA_GOLEM, Species.ALOLA_MAROWAK, - Species.MAROWAK, + Species.ETERNAL_FLOETTE, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, Species.GALAR_MR_MIME, @@ -53928,6 +53956,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.FROST_BREATH]: [ Species.DEWGONG, @@ -54975,10 +55004,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_ZORUA, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY, - [ - Species.URSALUNA, - 'bloodmoon', - ], + Species.BLOODMOON_URSALUNA, ], [Moves.PHANTOM_FORCE]: [ Species.HAUNTER, @@ -55068,6 +55094,7 @@ export const tmSpecies: TmSpecies = { Species.FLORAGATO, Species.MEOWSCARADA, Species.ARBOLIVA, + Species.ETERNAL_FLOETTE, Species.HISUI_LILLIGANT, ], [Moves.DISARMING_VOICE]: [ @@ -55149,6 +55176,7 @@ export const tmSpecies: TmSpecies = { Species.FEZANDIPITI, Species.ALOLA_VULPIX, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, ], [Moves.DRAINING_KISS]: [ Species.BUTTERFREE, @@ -55241,6 +55269,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_RAICHU, Species.ALOLA_VULPIX, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, ], [Moves.GRASSY_TERRAIN]: [ Species.BULBASAUR, @@ -55311,7 +55340,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -55358,6 +55386,7 @@ export const tmSpecies: TmSpecies = { Species.SINISTCHA, Species.OGERPON, Species.ALOLA_EXEGGUTOR, + Species.ETERNAL_FLOETTE, Species.HISUI_VOLTORB, Species.HISUI_ELECTRODE, Species.HISUI_LILLIGANT, @@ -55393,7 +55422,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.MEOWSTIC, @@ -55432,6 +55460,7 @@ export const tmSpecies: TmSpecies = { Species.IRON_VALIANT, Species.ALOLA_VULPIX, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, Species.GALAR_RAPIDASH, Species.GALAR_WEEZING, Species.GALAR_MR_MIME, @@ -56262,7 +56291,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SKIDDO, @@ -56418,6 +56446,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_MUK, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK, + Species.ETERNAL_FLOETTE, ], [Moves.MYSTICAL_FIRE]: [ Species.CHARIZARD, @@ -56762,7 +56791,6 @@ export const tmSpecies: TmSpecies = { 'orange', 'blue', 'white', - 'eternal', ], Species.FLORGES, Species.SPRITZEE, @@ -56827,6 +56855,7 @@ export const tmSpecies: TmSpecies = { Species.FEZANDIPITI, Species.ALOLA_VULPIX, Species.ALOLA_NINETALES, + Species.ETERNAL_FLOETTE, Species.GALAR_PONYTA, Species.GALAR_RAPIDASH, Species.GALAR_WEEZING, @@ -57094,6 +57123,7 @@ export const tmSpecies: TmSpecies = { ], Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, + Species.BLOODMOON_URSALUNA, ], [Moves.SOLAR_BLADE]: [ Species.PONYTA, @@ -57315,6 +57345,7 @@ export const tmSpecies: TmSpecies = { Species.BRUTE_BONNET, Species.WO_CHIEN, Species.DIPPLIN, + Species.ETERNAL_FLOETTE, Species.HISUI_LILLIGANT, ], [Moves.PSYCHIC_TERRAIN]: [ @@ -58044,6 +58075,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.LIQUIDATION]: [ Species.BLASTOISE, @@ -58356,6 +58388,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_AVALUGG, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.BREAKING_SWIPE]: [ Species.CHARIZARD, @@ -60259,6 +60292,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GOLEM, Species.ALOLA_GRIMER, Species.ALOLA_MUK, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, @@ -60285,6 +60319,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.ICE_SPINNER]: [ Species.JIGGLYPUFF, @@ -60757,6 +60792,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_RAICHU, Species.ALOLA_MEOWTH, Species.ALOLA_PERSIAN, + Species.ETERNAL_FLOETTE, Species.GALAR_MEOWTH, Species.GALAR_ZAPDOS, [ @@ -60768,6 +60804,7 @@ export const tmSpecies: TmSpecies = { Species.HISUI_DECIDUEYE, Species.PALDEA_TAUROS, Species.PALDEA_WOOPER, + Species.BLOODMOON_URSALUNA, ], [Moves.CHILLING_WATER]: [ Species.CLEFAIRY, @@ -60940,6 +60977,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_NINETALES, Species.ALOLA_MEOWTH, Species.ALOLA_PERSIAN, + Species.ETERNAL_FLOETTE, Species.GALAR_SLOWPOKE, Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING, @@ -61005,6 +61043,7 @@ export const tmSpecies: TmSpecies = { Species.ALOLA_GRAVELER, Species.ALOLA_GOLEM, Species.HISUI_AVALUGG, + Species.BLOODMOON_URSALUNA, ], [Moves.DRAGON_CHEER]: [ Species.CHARIZARD, @@ -61128,6 +61167,7 @@ export const tmSpecies: TmSpecies = { Species.ARBOLIVA, Species.FEZANDIPITI, Species.ALOLA_RAICHU, + Species.ETERNAL_FLOETTE, ], [Moves.TEMPER_FLARE]: [ Species.CHARMANDER,