Merge branch 'main' into feature/egg-translation

pull/403/head
Madmadness65 2024-05-13 11:46:41 -05:00 committed by GitHub
commit 930ec4c172
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4005 changed files with 229286 additions and 44696 deletions

View File

@ -44,6 +44,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
- Arata Iiyoshi
- Atsuhiro Ishizuna
- Pokémon Black/White 2
- Firel (Additional biome themes)
- edifette (Title screen music)
### 🎵 Sound Effects

View File

@ -11,6 +11,7 @@
<meta property="og:image" content="https://pokerogue.net/logo512.png" />
<link rel="apple-touch-icon" href="./logo512.png" />
<link rel="shortcut icon" type="image/png" href="./logo512.png" />
<link rel="canonical" href="https://pokerogue.net" />
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<style type="text/css">

Binary file not shown.

Binary file not shown.

View File

@ -1978,7 +1978,7 @@
},
{
"frameIndex": 0,
"resourceName": "PRAS- Sketch and Lick",
"resourceName": "PRAS- Sketch + Lick",
"bgX": 0,
"bgY": 0,
"opacity": 0,

View File

@ -4539,20 +4539,44 @@
"1000",
"1001",
"1004",
"1007-apex",
"1007-apex",
"1007-apex",
"1007-apex",
"1008-ultimate",
"127-mega",
"142-mega",
"150-mega",
"150-mega",
"181-mega",
"212-mega",
"282-mega_2",
"282-mega_2",
"282-mega_3",
"282-mega_3",
"3-mega_2",
"3-mega_2",
"3-mega_3",
"3-mega_3",
"303-mega",
"306-mega",
"308-mega",
"310-mega",
"334-mega",
"334-mega_2",
"334-mega_2",
"373-mega",
"376-mega",
"380-mega",
"381-mega",
"382-primal",
"383-primal",
"384-mega",
"384-mega_2",
"384-mega_2",
"4052",
"4077",
"4078",
"4263",
"4264",
"428-mega",
@ -4562,14 +4586,58 @@
"475-mega_2",
"475-mega_3",
"475-mega_3",
"6215",
"653",
"654",
"6549",
"655",
"6570",
"6571",
"664",
"665",
"666-archipelago",
"666-continental",
"666-elegant",
"666-fancy_2",
"666-fancy_2",
"666-fancy_3",
"666-fancy_3",
"666-garden",
"666-high",
"666-icy",
"666-jungle",
"666-marine",
"666-meadow_2",
"666-meadow_2",
"666-meadow_3",
"666-meadow_3",
"666-modern",
"666-monsoon",
"666-ocean",
"666-poke",
"666-poke",
"666-poke",
"666-polar",
"666-river",
"666-river_2",
"666-river_2",
"666-sandstorm",
"666-savanna",
"666-sun",
"666-tundra",
"6705",
"6706_2",
"6706_2",
"6706_3",
"6706_3",
"690",
"691",
"696",
"696_3",
"696_3",
"697",
"697_3",
"697_3",
"700",
"704",
"705_2",
@ -4581,20 +4649,74 @@
"709",
"710",
"711",
"716-active",
"716-neutral",
"717_2",
"717_2",
"717_3",
"717_3",
"720-unbound",
"720",
"728",
"729",
"730",
"730_2",
"730_2",
"747",
"748",
"753",
"754",
"755",
"756",
"761",
"762",
"763",
"767",
"768",
"771",
"771_2",
"771_2",
"771_3",
"771_3",
"789",
"790",
"791",
"791_1",
"791_1",
"792",
"793_2",
"793_2",
"793_3",
"793_3",
"800-dawn",
"800-dusk",
"800-ultra",
"800",
"802",
"808",
"809",
"821_2",
"821_2",
"821_3",
"821_3",
"822",
"823",
"829",
"830",
"835",
"836_2",
"836_2",
"836_3",
"836_3",
"850",
"851",
"856",
"857_2",
"857_2",
"857_3",
"857_3",
"858",
"863",
"872",
"873",
"877-hangry",
@ -4607,6 +4729,17 @@
"890_3",
"890_3",
"900",
"901",
"903",
"909",
"910_2",
"910_2",
"910_3",
"910_3",
"911_2",
"911_2",
"911_3",
"911_3",
"919",
"920",
"924",
@ -4620,32 +4753,103 @@
"925-three_2",
"925-three_3",
"925-three_3",
"932_2",
"932_2",
"932_3",
"932_3",
"933_2",
"933_2",
"933_3",
"933_3",
"934",
"935",
"935_3",
"935_3",
"936_1",
"936_1",
"936_2",
"936_2",
"936_3",
"936_3",
"937_1",
"937_1",
"937_2",
"937_2",
"937_3",
"937_3",
"94-mega_1",
"94-mega_1",
"94-mega_2",
"94-mega_2",
"94-mega_3",
"94-mega_3",
"948",
"949",
"962",
"967",
"968",
"969",
"970_2",
"970_2",
"970_3",
"970_3",
"973",
"978-curly_2",
"978-curly_2",
"978-curly_3",
"978-curly_3",
"978-droopy_2",
"978-droopy_2",
"978-droopy_3",
"978-droopy_3",
"978-stretchy_2",
"978-stretchy_2",
"978-stretchy_3",
"978-stretchy_3",
"987",
"988",
"988_3",
"988_3",
"994",
"994_3",
"994_3",
"999",
"999_1",
"999_1",
"1000b",
"1001b",
"1004b",
"1007b-apex",
"1007b-apex",
"1007b-apex",
"1007b-apex",
"1008b-ultimate",
"127b-mega",
"142b-mega",
"150b-mega",
"150b-mega",
"181b-mega",
"212b-mega",
"282b-mega",
"3b-mega_2",
"3b-mega_2",
"3b-mega_3",
"3b-mega_3",
"303b-mega",
"306b-mega",
"308b-mega",
"310b-mega",
"334b-mega",
"373b-mega",
"376b-mega",
"380b-mega",
"381b-mega",
"382b-primal",
"383b-primal",
"384b-mega",
"4052b",
"4077b",
"4078b",
"4263b",
"4264b",
"428b-mega",
@ -4655,14 +4859,104 @@
"475b-mega_2",
"475b-mega_3",
"475b-mega_3",
"6215b",
"653b",
"654b",
"6549b",
"655b",
"6570b",
"6571b",
"664b",
"665b",
"665_2b",
"665_2b",
"666b-archipelago_2",
"666b-archipelago_2",
"666b-archipelago_3",
"666b-archipelago_3",
"666b-continental_2",
"666b-continental_2",
"666b-continental_3",
"666b-continental_3",
"666b-elegant_2",
"666b-elegant_2",
"666b-elegant_3",
"666b-elegant_3",
"666b-fancy_2",
"666b-fancy_2",
"666b-fancy_3",
"666b-fancy_3",
"666b-garden_2",
"666b-garden_2",
"666b-garden_3",
"666b-garden_3",
"666b-high",
"666b-high",
"666b-high",
"666b-high",
"666b-icy",
"666b-icy",
"666b-icy",
"666b-icy",
"666b-jungle_2",
"666b-jungle_2",
"666b-jungle_3",
"666b-jungle_3",
"666b-marine_2",
"666b-marine_2",
"666b-marine_3",
"666b-marine_3",
"666b-meadow_2",
"666b-meadow_2",
"666b-meadow_3",
"666b-meadow_3",
"666b-modern_2",
"666b-modern_2",
"666b-modern_3",
"666b-modern_3",
"666b-monsoon_2",
"666b-monsoon_2",
"666b-monsoon_3",
"666b-monsoon_3",
"666b-ocean_2",
"666b-ocean_2",
"666b-ocean_3",
"666b-ocean_3",
"666b-poke",
"666b-poke",
"666b-poke",
"666b-poke",
"666b-polar_2",
"666b-polar_2",
"666b-polar_3",
"666b-polar_3",
"666b-river_2",
"666b-river_2",
"666b-river_3",
"666b-river_3",
"666b-sandstorm_2",
"666b-sandstorm_2",
"666b-sandstorm_3",
"666b-sandstorm_3",
"666b-savanna_2",
"666b-savanna_2",
"666b-savanna_3",
"666b-savanna_3",
"666b-sun_2",
"666b-sun_2",
"666b-sun_3",
"666b-sun_3",
"666b-tundra_2",
"666b-tundra_2",
"666b-tundra_3",
"666b-tundra_3",
"6705b",
"6706_2b",
"6706_2b",
"6706_3b",
"6706_3b",
"690b",
"691b",
"700b",
"704b",
"705b",
@ -4673,11 +4967,28 @@
"711b",
"720b-unbound",
"720b",
"747_2b",
"747_2b",
"747_3b",
"747_3b",
"748b",
"755b",
"756b",
"771b",
"789b",
"790b",
"791b",
"792b",
"793b",
"800b-dawn",
"800b-dusk",
"800b-ultra",
"800b",
"802b",
"829b",
"830b",
"850b",
"851b",
"856b",
"857_2b",
"857_2b",
@ -4706,7 +5017,30 @@
"925b-three_2",
"925b-three_3",
"925b-three_3",
"932b",
"933b",
"934b",
"935_1b",
"935_1b",
"935_2b",
"935_2b",
"935_3b",
"935_3b",
"936_1b",
"936_1b",
"936_2b",
"936_2b",
"936_3b",
"936_3b",
"937_1b",
"937_1b",
"937_2b",
"937_2b",
"937_3b",
"937_3b",
"94b-mega",
"948b",
"949b",
"962b",
"962_3b",
"962_3b",
@ -4714,5 +5048,6 @@
"973b",
"987b",
"988b",
"994b",
"999b"
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 910 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1022 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 776 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 885 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 4.7 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 980 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 31 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 26 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -4,302 +4,155 @@
"image": "716-active.png",
"format": "RGBA8888",
"size": {
"w": 474,
"h": 474
"w": 242,
"h": 242
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0014.png",
"filename": "0010.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 3,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 192,
"x": 81,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 80,
"h": 98
},
"frame": {
"x": 81,
"y": 0,
"w": 80,
"h": 98
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0015.png",
"filename": "0008.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 160,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 240,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 320,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 96,
"w": 80,
"h": 96
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"x": 5,
"y": 2,
"w": 81,
"h": 96
},
"frame": {
"x": 80,
"y": 192,
"w": 79,
"h": 96
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"h": 96
},
"frame": {
"x": 80,
"y": 288,
"w": 79,
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
@ -308,251 +161,62 @@
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 160,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 287,
"w": 80,
"h": 95
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 240,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 320,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 239,
"y": 191,
"w": 80,
"h": 95
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"x": 5,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 191,
"w": 80,
"h": 94
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0010.png",
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 6,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 285,
"w": 80,
"h": 94
"x": 81,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0021.png",
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"y": 1,
"w": 80,
"h": 94
"h": 97
},
"frame": {
"x": 239,
"y": 286,
"x": 162,
"y": 98,
"w": 80,
"h": 94
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 239,
"y": 380,
"w": 80,
"h": 94
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 319,
"y": 379,
"w": 80,
"h": 94
"h": 97
}
}
]
@ -561,6 +225,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:0cea7db7c741e40193d7f7caa38b8e51:f7f798d7d644d2747b17e2fffa7fa283:f062a143efe7a1f42b82d0e5295ae76b$"
"smartupdate": "$TexturePacker:SmartUpdate:f3f63c4c8b91d25b294f6a6b954a36eb:2c999d295d87e9938aebe900dcdb566b:f062a143efe7a1f42b82d0e5295ae76b$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -4,302 +4,155 @@
"image": "716-neutral.png",
"format": "RGBA8888",
"size": {
"w": 474,
"h": 474
"w": 242,
"h": 242
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0014.png",
"filename": "0010.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
"w": 81,
"h": 98
},
"frame": {
"x": 0,
"y": 96,
"w": 80,
"h": 96
"y": 0,
"w": 81,
"h": 98
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 3,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 192,
"x": 81,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 80,
"h": 98
},
"frame": {
"x": 81,
"y": 0,
"w": 80,
"h": 98
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0015.png",
"filename": "0008.png",
"rotated": false,
"trimmed": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 4,
"y": 0,
"w": 80,
"h": 96
"h": 98
},
"frame": {
"x": 0,
"y": 288,
"x": 161,
"y": 0,
"w": 80,
"h": 96
"h": 98
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 160,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 240,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 320,
"y": 0,
"w": 80,
"h": 96
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 80,
"h": 96
},
"frame": {
"x": 80,
"y": 96,
"w": 80,
"h": 96
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"x": 5,
"y": 2,
"w": 81,
"h": 96
},
"frame": {
"x": 80,
"y": 192,
"w": 79,
"h": 96
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 79,
"h": 96
},
"frame": {
"x": 80,
"y": 288,
"w": 79,
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
@ -308,251 +161,62 @@
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 192,
"w": 80,
"h": 95
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 160,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 159,
"y": 287,
"w": 80,
"h": 95
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 240,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 320,
"y": 96,
"w": 80,
"h": 95
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 80,
"h": 95
},
"frame": {
"x": 239,
"y": 191,
"w": 80,
"h": 95
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"x": 5,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 191,
"w": 80,
"h": 94
"x": 0,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0010.png",
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"x": 6,
"y": 2,
"w": 80,
"h": 94
"w": 81,
"h": 96
},
"frame": {
"x": 319,
"y": 285,
"w": 80,
"h": 94
"x": 81,
"y": 98,
"w": 81,
"h": 96
}
},
{
"filename": "0021.png",
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
"w": 87,
"h": 98
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"y": 1,
"w": 80,
"h": 94
"h": 97
},
"frame": {
"x": 239,
"y": 286,
"x": 162,
"y": 98,
"w": 80,
"h": 94
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 239,
"y": 380,
"w": 80,
"h": 94
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 80,
"h": 94
},
"frame": {
"x": 319,
"y": 379,
"w": 80,
"h": 94
"h": 97
}
}
]
@ -561,6 +225,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:ec804991398117c2b88f689a4f1b5070:c1c4a6ceac8aee1d59b3c02be5ffea54:b0d2498f5e4efc35ed4c0e6948ad71f3$"
"smartupdate": "$TexturePacker:SmartUpdate:8269dc2444e752deb5924ecf90702eb7:2c999d295d87e9938aebe900dcdb566b:b0d2498f5e4efc35ed4c0e6948ad71f3$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 26 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 27 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -1023,6 +1023,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:a0a16e01d8101930311b91d6623a0918:452ea2f0b385c76e75ace96da49c65c6:b0d2498f5e4efc35ed4c0e6948ad71f3$"
"smartupdate": "$TexturePacker:SmartUpdate:e87161792eb1bba2c892539c25079db0:e35d434a4b5c1af53502fca80b6b1837:b0d2498f5e4efc35ed4c0e6948ad71f3$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

Some files were not shown because too many files have changed in this diff Show More