Add egg gacha system and various minor changes

Add egg gacha system; remove certain mythical Pokemon from the wild pool as egg exclusive; add egg vouchers with UI; rework Shiny Charm odds; fix trainer Pokemon shiny odds not properly ignoring Shiny Charm modifier
This commit is contained in:
Flashfyre committed 2023-12-19 23:51:48 -05:00
1 parent 50d4858caa
commit aa94e044ab
71 files changed
+4303 -2241

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 951 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

@@ -4,7 +4,7 @@
"image": "egg.png",
"format": "RGBA8888",
"size": {
"w": 112,
"w": 138,
"h": 30
},
"scale": 1,
@@ -12,14 +12,14 @@
{
"filename": "egg_0",
"rotated": false,
"trimmed": true,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 32
"w": 28,
"h": 30
},
"spriteSourceSize": {
"x": 2,
"y": 1,
"x": 0,
"y": 0,
"w": 28,
"h": 30
},
@@ -33,14 +33,14 @@
{
"filename": "egg_1",
"rotated": false,
"trimmed": true,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 32
"w": 28,
"h": 30
},
"spriteSourceSize": {
"x": 2,
"y": 1,
"x": 0,
"y": 0,
"w": 28,
"h": 30
},
@@ -54,14 +54,14 @@
{
"filename": "egg_2",
"rotated": false,
"trimmed": true,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 32
"w": 28,
"h": 30
},
"spriteSourceSize": {
"x": 2,
"y": 1,
"x": 0,
"y": 0,
"w": 28,
"h": 30
},
@@ -75,14 +75,14 @@
{
"filename": "egg_3",
"rotated": false,
"trimmed": true,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 32
"w": 28,
"h": 30
},
"spriteSourceSize": {
"x": 2,
"y": 1,
"x": 0,
"y": 0,
"w": 28,
"h": 30
},
@@ -92,6 +92,27 @@
"w": 28,
"h": 30
}
},
{
"filename": "egg_manaphy",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 26,
"h": 30
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 26,
"h": 30
},
"frame": {
"x": 112,
"y": 0,
"w": 26,
"h": 30
}
}
]
}
@@ -99,6 +120,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:a2a114a3e275355f11c124f7ddc3a158:87e6ddecd2221fa223d5a07b1b3bb040:f2ac48b1c7b5b0a41ac50c4888a029cf$"
"smartupdate": "$TexturePacker:SmartUpdate:ba653f2a1c1d028d27d209346c8f5cda:d1a96146bbb57b7f2dbd12209e9e846d:f2ac48b1c7b5b0a41ac50c4888a029cf$"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

File renamed without changes.
File renamed without changes.
+125
View File
@@ -0,0 +1,125 @@
{
"textures": [
{
"image": "egg_icons.png",
"format": "RGBA8888",
"size": {
"w": 64,
"h": 15
},
"scale": 1,
"frames": [
{
"filename": "0",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 14,
"y": 14,
"w": 13,
"h": 14
},
"frame": {
"x": 0,
"y": 0,
"w": 13,
"h": 14
}
},
{
"filename": "1",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 14,
"y": 14,
"w": 13,
"h": 14
},
"frame": {
"x": 13,
"y": 0,
"w": 13,
"h": 14
}
},
{
"filename": "2",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 14,
"y": 14,
"w": 13,
"h": 14
},
"frame": {
"x": 26,
"y": 0,
"w": 13,
"h": 14
}
},
{
"filename": "3",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 14,
"y": 14,
"w": 13,
"h": 14
},
"frame": {
"x": 39,
"y": 0,
"w": 13,
"h": 14
}
},
{
"filename": "manaphy",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 14,
"y": 13,
"w": 12,
"h": 15
},
"frame": {
"x": 52,
"y": 0,
"w": 12,
"h": 15
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:5bdeccfea3b20316b6f997ded4917832:9d7fd6a01652d18587263aea89256028:9ca79c86befa783c0f0fdd62dae4f950$"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

+104
View File
@@ -0,0 +1,104 @@
{
"textures": [
{
"image": "gacha_hatch.png",
"format": "RGBA8888",
"size": {
"w": 53,
"h": 53
},
"scale": 1,
"frames": [
{
"filename": "1.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 32
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 32
},
"frame": {
"x": 0,
"y": 0,
"w": 25,
"h": 32
}
},
{
"filename": "2.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 25,
"h": 32
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 31
},
"frame": {
"x": 25,
"y": 0,
"w": 25,
"h": 31
}
},
{
"filename": "3.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 25,
"h": 32
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 22
},
"frame": {
"x": 25,
"y": 31,
"w": 25,
"h": 22
}
},
{
"filename": "4.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 25,
"h": 32
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 12
},
"frame": {
"x": 0,
"y": 32,
"w": 25,
"h": 12
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:dba061ae0c944cad946da89a3db61ef3:6bcb3cebd91542179a70caca502090cd:03d3c0cdbe3979a45ab948bf5fc6c5fe$"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@@ -0,0 +1,62 @@
{
"textures": [
{
"image": "gacha_underlay_legendary.png",
"format": "RGBA8888",
"size": {
"w": 25,
"h": 104
},
"scale": 1,
"frames": [
{
"filename": "default",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
},
"frame": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
}
},
{
"filename": "open_hatch",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
},
"frame": {
"x": 0,
"y": 52,
"w": 25,
"h": 52
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:2714c584c99d3f151df83633a3e573e2:9a5a390cb558062cd2b0d8b9e577816a:dc9ad86988e4cd7eb47a54564121d8fa$"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

@@ -0,0 +1,62 @@
{
"textures": [
{
"image": "gacha_underlay_shiny.png",
"format": "RGBA8888",
"size": {
"w": 25,
"h": 104
},
"scale": 1,
"frames": [
{
"filename": "default",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
},
"frame": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
}
},
{
"filename": "open_hatch",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
},
"frame": {
"x": 0,
"y": 52,
"w": 25,
"h": 52
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:2714c584c99d3f151df83633a3e573e2:9a5a390cb558062cd2b0d8b9e577816a:dc9ad86988e4cd7eb47a54564121d8fa$"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

@@ -0,0 +1,62 @@
{
"textures": [
{
"image": "gacha_underlay_type.png",
"format": "RGBA8888",
"size": {
"w": 25,
"h": 104
},
"scale": 1,
"frames": [
{
"filename": "default",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
},
"frame": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
}
},
{
"filename": "open_hatch",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 25,
"h": 52
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 25,
"h": 52
},
"frame": {
"x": 0,
"y": 52,
"w": 25,
"h": 52
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:2714c584c99d3f151df83633a3e573e2:9a5a390cb558062cd2b0d8b9e577816a:dc9ad86988e4cd7eb47a54564121d8fa$"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 421 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

+1275 -1191
View File
File diff suppressed because it is too large. Load diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB