fix conflict without rebase (#1186)

This commit is contained in:
Greenlamp2 2024-05-26 03:36:09 +02:00 committed by GitHub
parent de1c2b2b5b
commit b170478119
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 15712 additions and 37 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,32 @@
{
"1": {
"1b2627": "1b2627",
"474749": "156a66",
"010101": "010101",
"303034": "094448",
"f5f5f6": "f5ffea",
"b2b3b2": "90c093",
"949496": "1c8155",
"282730": "002729",
"242428": "001b1a",
"6f7071": "01473a",
"df84ad": "ff69fa",
"9b4f69": "d414dd",
"fcfcfc": "fcfcfc"
},
"2": {
"1b2627": "060724",
"474749": "8655e1",
"010101": "010101",
"303034": "5a3eb9",
"f5f5f6": "342d4c",
"b2b3b2": "18133d",
"949496": "302e89",
"282730": "180c46",
"242428": "161058",
"6f7071": "2e1d7b",
"df84ad": "54f1ff",
"9b4f69": "0099ce",
"fcfcfc": "fcfcfc"
}
}

View File

@ -1220,7 +1220,7 @@
1
],
"623": [
1,
2,
1,
1
],
@ -1754,6 +1754,11 @@
1,
1
],
"862": [
0,
1,
1
],
"863": [
0,
1,
@ -1796,8 +1801,8 @@
],
"890-eternamax": [
0,
2,
2
1,
1
],
"890": [
0,
@ -2499,7 +2504,7 @@
],
"212-mega": [
1,
1,
2,
1
],
"212": [
@ -2920,7 +2925,7 @@
"426": [
0,
1,
1
2
],
"427": [
0,
@ -3323,7 +3328,7 @@
1
],
"623": [
1,
2,
1,
1
],
@ -3857,6 +3862,11 @@
1,
1
],
"862": [
0,
1,
1
],
"863": [
0,
1,
@ -4175,7 +4185,7 @@
],
"399": [
0,
1,
2,
1
],
"400": [
@ -4249,7 +4259,7 @@
"212-mega": [
1,
1,
1
2
],
"282-mega": [
0,
@ -4473,7 +4483,7 @@
],
"696": [
0,
1,
2,
2
],
"697": [
@ -4553,8 +4563,8 @@
],
"729": [
0,
1,
1
2,
2
],
"730": [
0,
@ -4564,7 +4574,7 @@
"747": [
0,
2,
1
2
],
"748": [
0,
@ -4578,8 +4588,8 @@
],
"754": [
0,
1,
1
2,
2
],
"755": [
0,
@ -4746,6 +4756,11 @@
1,
1
],
"862": [
0,
1,
1
],
"863": [
0,
1,
@ -4789,7 +4804,12 @@
"890": [
0,
2,
2
1
],
"890-eternamax": [
0,
1,
1
],
"900": [
0,
@ -5070,8 +5090,8 @@
],
"212-mega": [
1,
1,
1
2,
2
],
"282-mega": [
0,
@ -5400,7 +5420,7 @@
],
"754": [
0,
1,
2,
2
],
"755": [
@ -5563,6 +5583,11 @@
1,
1
],
"862": [
0,
1,
1
],
"863": [
0,
1,
@ -5725,8 +5750,8 @@
],
"970": [
0,
2,
2
1,
1
],
"973": [
1,

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "212-mega_2.png",
"format": "RGBA8888",
"size": {
"w": 86,
"h": 86
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 72,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 72,
"h": 86
},
"frame": {
"x": 0,
"y": 0,
"w": 72,
"h": 86
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:3fba14a8cd6c5a8717bb5ccf414ed76d:5ebfc3bcaa77a0ff9d55a9b15383f0ef:d0a607721d6bb74ae9b6d486116d85e3$"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,32 @@
{
"1": {
"1b2627": "1b2627",
"010101": "010101",
"474749": "156a66",
"303034": "094448",
"6f7071": "01473a",
"b2b3b2": "90c093",
"463f39": "001b1a",
"949496": "1c8155",
"f5f5f6": "f5ffea",
"9b4f69": "d414dd",
"df84ad": "ff69fa",
"2b2d2e": "052332",
"fcfcfc": "fcfcfc"
},
"2": {
"1b2627": "180c46",
"010101": "010101",
"474749": "8655e1",
"303034": "5a3eb9",
"6f7071": "2e1d7b",
"b2b3b2": "1f1a43",
"463f39": "161058",
"949496": "302e89",
"f5f5f6": "342d4c",
"9b4f69": "0099ce",
"df84ad": "54f1ff",
"2b2d2e": "060429",
"fcfcfc": "fcfcfc"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,692 @@
{
"textures": [
{
"image": "696_2.png",
"format": "RGBA8888",
"size": {
"w": 135,
"h": 135
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0031.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0032.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 53,
"y": 0,
"w": 53,
"h": 46
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 46,
"w": 53,
"h": 46
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 46
},
"frame": {
"x": 0,
"y": 46,
"w": 53,
"h": 46
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 3,
"w": 53,
"h": 43
},
"frame": {
"x": 0,
"y": 92,
"w": 53,
"h": 43
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 3,
"w": 53,
"h": 43
},
"frame": {
"x": 0,
"y": 92,
"w": 53,
"h": 43
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0021.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0029.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0030.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 53,
"h": 45
},
"frame": {
"x": 53,
"y": 46,
"w": 53,
"h": 45
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 53,
"h": 44
},
"frame": {
"x": 53,
"y": 91,
"w": 53,
"h": 44
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 53,
"h": 44
},
"frame": {
"x": 53,
"y": 91,
"w": 53,
"h": 44
}
},
{
"filename": "0027.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 53,
"h": 44
},
"frame": {
"x": 53,
"y": 91,
"w": 53,
"h": 44
}
},
{
"filename": "0028.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 53,
"h": 46
},
"spriteSourceSize": {
"x": 0,
"y": 2,
"w": 53,
"h": 44
},
"frame": {
"x": 53,
"y": 91,
"w": 53,
"h": 44
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:f6c90e8287d3ce2aa68c9fef98f6e12f:24cf84ba4764bd88b4e751ca1911a8d5:58b7763fb9abdd043e9bfa400cfafdef$"
}
}

View File

@ -0,0 +1,272 @@
{
"textures": [
{
"image": "729_2.png",
"format": "RGBA8888",
"size": {
"w": 141,
"h": 141
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 49,
"h": 51
},
"frame": {
"x": 0,
"y": 0,
"w": 49,
"h": 51
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 49,
"h": 51
},
"frame": {
"x": 0,
"y": 51,
"w": 49,
"h": 51
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 49,
"h": 51
},
"frame": {
"x": 0,
"y": 51,
"w": 49,
"h": 51
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 48,
"h": 50
},
"frame": {
"x": 49,
"y": 0,
"w": 48,
"h": 50
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 48,
"h": 50
},
"frame": {
"x": 49,
"y": 0,
"w": 48,
"h": 50
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 42,
"h": 47
},
"frame": {
"x": 97,
"y": 0,
"w": 42,
"h": 47
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 42,
"h": 47
},
"frame": {
"x": 97,
"y": 0,
"w": 42,
"h": 47
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 40,
"h": 47
},
"frame": {
"x": 97,
"y": 47,
"w": 40,
"h": 47
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 3,
"w": 46,
"h": 48
},
"frame": {
"x": 49,
"y": 50,
"w": 46,
"h": 48
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 3,
"w": 46,
"h": 48
},
"frame": {
"x": 49,
"y": 50,
"w": 46,
"h": 48
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 45,
"h": 47
},
"frame": {
"x": 95,
"y": 94,
"w": 45,
"h": 47
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 45,
"h": 47
},
"frame": {
"x": 95,
"y": 94,
"w": 45,
"h": 47
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:4df3ec883b357e664a50e3015060795f:29a8d34f9df9fa51691fda1da5961207:b2d5dd692ec79c7357afdffa7b3670a9$"
}
}

View File

@ -0,0 +1,272 @@
{
"textures": [
{
"image": "729_3.png",
"format": "RGBA8888",
"size": {
"w": 141,
"h": 141
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 49,
"h": 51
},
"frame": {
"x": 0,
"y": 0,
"w": 49,
"h": 51
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 49,
"h": 51
},
"frame": {
"x": 0,
"y": 51,
"w": 49,
"h": 51
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 49,
"h": 51
},
"frame": {
"x": 0,
"y": 51,
"w": 49,
"h": 51
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 48,
"h": 50
},
"frame": {
"x": 49,
"y": 0,
"w": 48,
"h": 50
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 48,
"h": 50
},
"frame": {
"x": 49,
"y": 0,
"w": 48,
"h": 50
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 42,
"h": 47
},
"frame": {
"x": 97,
"y": 0,
"w": 42,
"h": 47
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 42,
"h": 47
},
"frame": {
"x": 97,
"y": 0,
"w": 42,
"h": 47
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 40,
"h": 47
},
"frame": {
"x": 97,
"y": 47,
"w": 40,
"h": 47
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 3,
"w": 46,
"h": 48
},
"frame": {
"x": 49,
"y": 50,
"w": 46,
"h": 48
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 3,
"w": 46,
"h": 48
},
"frame": {
"x": 49,
"y": 50,
"w": 46,
"h": 48
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 45,
"h": 47
},
"frame": {
"x": 95,
"y": 94,
"w": 45,
"h": 47
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 50,
"h": 51
},
"spriteSourceSize": {
"x": 0,
"y": 4,
"w": 45,
"h": 47
},
"frame": {
"x": 95,
"y": 94,
"w": 45,
"h": 47
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:4df3ec883b357e664a50e3015060795f:29a8d34f9df9fa51691fda1da5961207:b2d5dd692ec79c7357afdffa7b3670a9$"
}
}

View File

@ -0,0 +1,188 @@
{
"textures": [
{
"image": "747_3.png",
"format": "RGBA8888",
"size": {
"w": 110,
"h": 110
},
"scale": 1,
"frames": [
{
"filename": "0003.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
},
"frame": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
},
"frame": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
},
"frame": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
},
"frame": {
"x": 0,
"y": 0,
"w": 55,
"h": 47
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 46
},
"frame": {
"x": 55,
"y": 0,
"w": 55,
"h": 46
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 46
},
"frame": {
"x": 55,
"y": 0,
"w": 55,
"h": 46
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 55,
"h": 46
},
"frame": {
"x": 55,
"y": 46,
"w": 55,
"h": 46
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 55,
"h": 47
},
"spriteSourceSize": {
"x": 0,
"y": 1,
"w": 55,
"h": 46
},
"frame": {
"x": 55,
"y": 46,
"w": 55,
"h": 46
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:e4c4f790c4f0286f608dcdb15a609059:464f7ae7db1c0d034c2a1a65612b0da8:b26f7254994561969f00f765318acf1c$"
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,32 @@
{
"1": {
"1b2627": "1b2627",
"474749": "156a66",
"010101": "010101",
"f5f5f6": "f5ffea",
"b2b3b2": "90c093",
"303034": "094448",
"949496": "1c8155",
"463f39": "156a66",
"6f7071": "01473a",
"df84ad": "ff69fa",
"9b4f69": "d414dd",
"fcfcfc": "fcfcfc",
"494d56": "156a66"
},
"2": {
"1b2627": "060724",
"474749": "8655e1",
"010101": "010101",
"f5f5f6": "342d4c",
"b2b3b2": "18133d",
"303034": "5a3eb9",
"949496": "302e89",
"463f39": "8655e1",
"6f7071": "2e1d7b",
"df84ad": "54f1ff",
"9b4f69": "0099ce",
"fcfcfc": "fcfcfc",
"494d56": "8655e1"
}
}

View File

@ -0,0 +1,28 @@
{
"1": {
"25134c": "162a52",
"010101": "010101",
"3622a7": "406d89",
"6461ba": "4989a6",
"31245f": "264864",
"ab2a4c": "0d6fae",
"ffb6b6": "a6fbff",
"ff5657": "45c5e5",
"ffdfdf": "f1faff",
"e23434": "1c98c7",
"ff8c8c": "6ee7f8"
},
"2": {
"25134c": "354e95",
"010101": "010101",
"3622a7": "bfd1fa",
"6461ba": "e1ecff",
"31245f": "87a3dd",
"ab2a4c": "ac4709",
"ffb6b6": "ffd456",
"ff5657": "d47823",
"ffdfdf": "ffee85",
"e23434": "c86016",
"ff8c8c": "ed972e"
}
}

View File

@ -0,0 +1,19 @@
{
"2": {
"26124d": "4963af",
"3a15bc": "bfd1fa",
"010101": "010101",
"b21833": "7b2f0e",
"eb1533": "cb7622",
"9a2433": "732208",
"3d2871": "87a3dd",
"f46d70": "f1bd4b",
"fb2553": "934516",
"675cc5": "675cc5",
"ffbcbc": "de9335",
"12042d": "12042d",
"e22dbc": "298fb9",
"f18cd5": "73e5dc",
"fefefe": "fefefe"
}
}

View File

@ -0,0 +1,440 @@
{
"textures": [
{
"image": "212-mega_2.png",
"format": "RGBA8888",
"size": {
"w": 344,
"h": 344
},
"scale": 1,
"frames": [
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 0,
"w": 76,
"h": 86
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 0,
"w": 76,
"h": 86
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 86,
"w": 76,
"h": 86
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 172,
"w": 76,
"h": 86
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 258,
"w": 76,
"h": 86
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 224,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 172,
"w": 74,
"h": 86
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 258,
"w": 74,
"h": 86
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 258,
"w": 74,
"h": 86
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 224,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 224,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 172,
"w": 74,
"h": 86
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 72,
"h": 86
},
"frame": {
"x": 150,
"y": 258,
"w": 72,
"h": 86
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 72,
"h": 86
},
"frame": {
"x": 222,
"y": 258,
"w": 72,
"h": 86
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 71,
"h": 86
},
"frame": {
"x": 224,
"y": 172,
"w": 71,
"h": 86
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:1b7ede0d536069418738b9c0f67f14fd:7b469c796eb673d31bdab8ad7b99b881:d0a607721d6bb74ae9b6d486116d85e3$"
}
}

View File

@ -0,0 +1,440 @@
{
"textures": [
{
"image": "212-mega_3.png",
"format": "RGBA8888",
"size": {
"w": 344,
"h": 344
},
"scale": 1,
"frames": [
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 0,
"w": 76,
"h": 86
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 0,
"w": 76,
"h": 86
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 86,
"w": 76,
"h": 86
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 172,
"w": 76,
"h": 86
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 76,
"h": 86
},
"frame": {
"x": 0,
"y": 258,
"w": 76,
"h": 86
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 224,
"y": 0,
"w": 74,
"h": 86
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 2,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 172,
"w": 74,
"h": 86
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 258,
"w": 74,
"h": 86
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 76,
"y": 258,
"w": 74,
"h": 86
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 224,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 224,
"y": 86,
"w": 74,
"h": 86
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 74,
"h": 86
},
"frame": {
"x": 150,
"y": 172,
"w": 74,
"h": 86
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 72,
"h": 86
},
"frame": {
"x": 150,
"y": 258,
"w": 72,
"h": 86
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 72,
"h": 86
},
"frame": {
"x": 222,
"y": 258,
"w": 72,
"h": 86
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 79,
"h": 86
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 71,
"h": 86
},
"frame": {
"x": 224,
"y": 172,
"w": 71,
"h": 86
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:1b7ede0d536069418738b9c0f67f14fd:7b469c796eb673d31bdab8ad7b99b881:d0a607721d6bb74ae9b6d486116d85e3$"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
{
"1": {
"010101": "010101",
"1b2627": "1b2627",
"474749": "156a66",
"303034": "094448",
"6f7071": "01473a",
"b2b3b2": "90c093",
"463f39": "001b1a",
"f5f5f6": "f5ffea",
"949496": "1c8155",
"9b4f69": "d414dd",
"df84ad": "ff69fa",
"fcfcfc": "fcfcfc"
},
"2": {
"010101": "010101",
"1b2627": "180c46",
"474749": "8655e1",
"303034": "5a3eb9",
"6f7071": "2e1d7b",
"b2b3b2": "1f1a43",
"463f39": "161058",
"f5f5f6": "342d4c",
"949496": "302e89",
"9b4f69": "0099ce",
"df84ad": "54f1ff",
"fcfcfc": "fcfcfc"
}
}

View File

@ -0,0 +1,26 @@
{
"1": {
"242737": "242737",
"366956": "521d0c",
"41968b": "c57833",
"5de0aa": "fbce5d",
"262b6b": "323b51",
"3253d6": "577b81",
"2c369a": "435469",
"a02c75": "3f4a6f",
"fd84ba": "bbe3ee",
"e0548f": "758eb4"
},
"2": {
"242737": "2e1d1a",
"366956": "6d171f",
"41968b": "b21a1a",
"5de0aa": "d95e3e",
"262b6b": "b07963",
"3253d6": "ffe6ca",
"2c369a": "d9aa8a",
"a02c75": "153532",
"fd84ba": "429d72",
"e0548f": "28625e"
}
}

View File

@ -50,46 +50,54 @@ describe("check if every variant's sprite are correctly set", () => {
if (name.includes("_")) {
const id = name.split("_")[0];
const variant = name.split("_")[1];
const index = parseInt(variant, 10) - 1;
if (ext !== "json") {
if (mlist.hasOwnProperty(id)) {
const urlJsonFile = `${dirpath}${id}.json`;
if (mlist.hasOwnProperty(id)) {
const trimmedUrlJsonFilepath = `${trimmedDirpath}${id}.json`;
const jsonFileExists = fs.existsSync(urlJsonFile);
if (mlist[id].includes(1)) {
if (mlist[id].includes(1) && !jsonFileExists) {
const msg = `[${name}] MISSING JSON ${trimmedUrlJsonFilepath}`;
if (!jsonFileExists && !errors.includes(msg)) {
if (!errors.includes(msg)) {
errors.push(msg);
}
}
}
if (!mlist.hasOwnProperty(id)) {
if (!mlist.hasOwnProperty(id) && jsonFileExists) {
errors.push(`[${id}] missing key ${id} in masterlist for ${trimmedFilePath}`);
} else if (mlist[id][parseInt(variant, 10) - 1] !== 2) {
const urlJsonFile = `${dirpath}${name}.json`;
const trimmedUrlJsonFilepath = `${trimmedDirpath}${name}.json`;
const jsonFileExists = fs.existsSync(urlJsonFile);
if (mlist[id].includes(1)) {
const msg = `[${id}] MISSING JSON ${trimmedUrlJsonFilepath}`;
if (!jsonFileExists && !errors.includes(msg)) {
errors.push(msg);
}
if (mlist[id][index] === 1 && jsonFileExists) {
const raw = fs.readFileSync(urlJsonFile, {encoding: "utf8", flag: "r"});
const data = JSON.parse(raw);
const keys = Object.keys(data);
if (!keys.includes(`${index}`)) {
const urlSpriteJsonFile = `${dirpath}${id}_${variant}.json`;
const trimmedUrlSpriteFilepath = `${trimmedDirpath}${id}_${variant}.json`;
const spriteFileExists = fs.existsSync(urlSpriteJsonFile);
if (spriteFileExists) {
errors.push(`[${id}] [${mlist[id]}] - the value should be 2 for the index ${index} - ${trimmedUrlSpriteFilepath}`);
}
}
}
errors.push(`[${id}] [${mlist[id]}] - the value should be 2 for the index ${parseInt(variant, 10) - 1} - ${trimmedFilePath}`);
}
}
} else if (!mlist.hasOwnProperty(name)) {
errors.push(`named - missing key ${name} in masterlist for ${trimmedFilePath}`);
errors.push(`[${name}] - missing key ${name} in masterlist for ${trimmedFilePath}`);
} else {
const raw = fs.readFileSync(filePath, {encoding: "utf8", flag: "r"});
const data = JSON.parse(raw);
for (const key of Object.keys(data)) {
if (mlist[name][key] !== 1) {
// if 2, check if json there
const urlSpriteJsonFile = `${dirpath}${name}_${parseInt(key, 10) + 1}.json`;
const spriteFileExists = fs.existsSync(urlSpriteJsonFile);
if (!spriteFileExists) {
errors.push(`[${name}] [${mlist[name]}] - the value should be 1 for the index ${key} - ${trimmedFilePath}`);
}
}
}
}
}
}
return errors;
}