ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #122 from AsdarDevelops/a-trainers-test 

A Trainer's Test
This commit is contained in:
ImperialSympathizer 2024-08-01 10:22:27 -04:00 committed by GitHub
parent 3cb64cfa1f 4c664f805c
commit 8e6b680efe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
58 changed files with 2919 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
public/images/mystery-encounters/safari_zone.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "safari_zone.png",
"format": "RGBA8888",
"size": {
"w": 120,
"h": 84
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 118,
"h": 82
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 118,
"h": 82
},
"frame": {
"x": 1,
"y": 1,
"w": 118,
"h": 82
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:6fad7a61e47043b974153148b4fd3997:5ec4d0890f2f03446daf22c8ae8ba77b:87aa745cd95eef6cbf38935230f4e10f$"
}
}

BIN
public/images/mystery-encounters/safari_zone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

524
public/images/trainer/buck.json Normal file
View File

@ -0,0 +1,524 @@
{
"textures": [
{
"image": "buck.png",
"format": "RGBA8888",
"size": {
"w": 120,
"h": 78
},
"scale": 1,
"frames": [
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 33,
"y": 4,
"w": 35,
"h": 76
},
"frame": {
"x": 1,
"y": 1,
"w": 35,
"h": 76
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 18,
"y": 8,
"w": 44,
"h": 72
},
"frame": {
"x": 38,
"y": 1,
"w": 44,
"h": 72
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 18,
"y": 8,
"w": 44,
"h": 72
},
"frame": {
"x": 38,
"y": 1,
"w": 44,
"h": 72
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 15,
"y": 8,
"w": 44,
"h": 72
},
"frame": {
"x": 38,
"y": 1,
"w": 44,
"h": 72
}
},
{
"filename": "0021.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 15,
"y": 8,
"w": 44,
"h": 72
},
"frame": {
"x": 38,
"y": 1,
"w": 44,
"h": 72
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 13,
"y": 8,
"w": 44,
"h": 72
},
"frame": {
"x": 38,
"y": 1,
"w": 44,
"h": 72
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 13,
"y": 8,
"w": 44,
"h": 72
},
"frame": {
"x": 38,
"y": 1,
"w": 44,
"h": 72
}
},
{
"filename": "0000.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 34,
"y": 5,
"w": 35,
"h": 75
},
"frame": {
"x": 84,
"y": 1,
"w": 35,
"h": 75
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:033f3d363b4192f64c92e02c19622c15:0d06141bef5af87ef82da967253207cb:3347efe478119141b0e3e6eccdecd0f5$"
}
}

BIN
public/images/trainer/buck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

398
public/images/trainer/cheryl.json Normal file
View File

@ -0,0 +1,398 @@
{
"textures": [
{
"image": "cheryl.png",
"format": "RGBA8888",
"size": {
"w": 154,
"h": 83
},
"scale": 1,
"frames": [
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 25,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 1,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 25,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 1,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 26,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 1,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 26,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 1,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 27,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 44,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 27,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 44,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 24,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 44,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 24,
"y": 0,
"w": 41,
"h": 81
},
"frame": {
"x": 44,
"y": 1,
"w": 41,
"h": 81
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 27,
"y": 0,
"w": 33,
"h": 81
},
"frame": {
"x": 87,
"y": 1,
"w": 33,
"h": 81
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 27,
"y": 0,
"w": 33,
"h": 81
},
"frame": {
"x": 87,
"y": 1,
"w": 33,
"h": 81
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 26,
"y": 0,
"w": 33,
"h": 81
},
"frame": {
"x": 87,
"y": 1,
"w": 33,
"h": 81
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 26,
"y": 0,
"w": 33,
"h": 81
},
"frame": {
"x": 87,
"y": 1,
"w": 33,
"h": 81
}
},
{
"filename": "0000.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 20,
"y": 0,
"w": 31,
"h": 81
},
"frame": {
"x": 122,
"y": 1,
"w": 31,
"h": 81
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 20,
"y": 0,
"w": 31,
"h": 81
},
"frame": {
"x": 122,
"y": 1,
"w": 31,
"h": 81
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 20,
"y": 0,
"w": 31,
"h": 81
},
"frame": {
"x": 122,
"y": 1,
"w": 31,
"h": 81
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 20,
"y": 0,
"w": 31,
"h": 81
},
"frame": {
"x": 122,
"y": 1,
"w": 31,
"h": 81
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 21,
"y": 0,
"w": 31,
"h": 81
},
"frame": {
"x": 122,
"y": 1,
"w": 31,
"h": 81
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 81
},
"spriteSourceSize": {
"x": 21,
"y": 0,
"w": 31,
"h": 81
},
"frame": {
"x": 122,
"y": 1,
"w": 31,
"h": 81
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:dfcf7aedbd588c4e42427a2e17c171bf:206549943a0e3325d20a017ef01eefee:a233cd27590422717866c66e366b68fb$"
}
}

BIN
public/images/trainer/cheryl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

83
public/images/trainer/marley.json Normal file
View File

@ -0,0 +1,83 @@
{ "frames": [
{
"filename": "0000.png",
"frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0001.png",
"frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0002.png",
"frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0003.png",
"frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0004.png",
"frame": { "x": 32, "y": 0, "w": 28, "h": 78 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 28, "y": 1, "w": 28, "h": 78 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0005.png",
"frame": { "x": 32, "y": 0, "w": 28, "h": 78 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 28, "y": 1, "w": 28, "h": 78 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0006.png",
"frame": { "x": 0, "y": 78, "w": 31, "h": 77 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 28, "y": 2, "w": 31, "h": 77 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0007.png",
"frame": { "x": 0, "y": 78, "w": 31, "h": 77 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 28, "y": 2, "w": 31, "h": 77 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
}
],
"meta": {
"app": "https://www.pngprite.org/",
"version": "1.3.7-x64",
"image": "marley.png",
"format": "I8",
"size": { "w": 60, "h": 155 },
"scale": "1"
}
}

BIN
public/images/trainer/marley.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

209
public/images/trainer/mira.json Normal file
View File

@ -0,0 +1,209 @@
{ "frames": [
{
"filename": "0000.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 23, "y": 14, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0001.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 23, "y": 14, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0002.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 22, "y": 13, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0003.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 11, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0004.png",
"frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 11, "w": 53, "h": 63 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0005.png",
"frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 12, "w": 53, "h": 63 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0006.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 13, "y": 11, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0007.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 13, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0008.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 14, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0009.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 13, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0010.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 13, "y": 11, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0011.png",
"frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 11, "w": 53, "h": 63 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0012.png",
"frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 12, "w": 53, "h": 63 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0013.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 11, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0014.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 22, "y": 13, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0015.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 23, "y": 14, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0016.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 22, "y": 13, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0017.png",
"frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 11, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0018.png",
"frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 11, "w": 53, "h": 63 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0019.png",
"frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 21, "y": 12, "w": 53, "h": 63 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0020.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 13, "y": 11, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0021.png",
"frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 13, "w": 44, "h": 65 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3.7-x64",
"image": "mira.png",
"format": "I8",
"size": { "w": 97, "h": 128 },
"scale": "1"
}
}

BIN
public/images/trainer/mira.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

209
public/images/trainer/riley.json Normal file
View File

@ -0,0 +1,209 @@
{ "frames": [
{
"filename": "0000.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0001.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0002.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0003.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0004.png",
"frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 31, "y": 0, "w": 37, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0005.png",
"frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 31, "y": 0, "w": 37, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0006.png",
"frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 30, "y": 0, "w": 37, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0007.png",
"frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 30, "y": 0, "w": 37, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0008.png",
"frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 28, "y": 0, "w": 37, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0009.png",
"frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 28, "y": 0, "w": 37, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0010.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 10, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0011.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 10, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0012.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0013.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0014.png",
"frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0015.png",
"frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0016.png",
"frame": { "x": 0, "y": 80, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0017.png",
"frame": { "x": 0, "y": 80, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0018.png",
"frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0019.png",
"frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0020.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
},
{
"filename": "0021.png",
"frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
"rotated": false,
"trimmed": true,
"spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
"sourceSize": { "w": 80, "h": 80 },
"duration": 100
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3.7-x64",
"image": "riley.png",
"format": "I8",
"size": { "w": 110, "h": 160 },
"scale": "1"
}
}

BIN
public/images/trainer/riley.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

70
src/data/dialogue.ts
View File

@ -665,6 +665,76 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
] ]
} }
], ],
[TrainerType.BUCK]: [
{
encounter: [
"dialogue:stat_trainer_buck.encounter.1",
"dialogue:stat_trainer_buck.encounter.2"
],
victory: [
"dialogue:stat_trainer_buck.victory.1"
],
defeat: [
"dialogue:stat_trainer_buck.defeat.1"
]
}
],
[TrainerType.CHERYL]: [
{
encounter: [
"dialogue:stat_trainer_cheryl.encounter.1",
"dialogue:stat_trainer_cheryl.encounter.2"
],
victory: [
"dialogue:stat_trainer_cheryl.victory.1"
],
defeat: [
"dialogue:stat_trainer_cheryl.defeat.1"
]
}
],
[TrainerType.MARLEY]: [
{
encounter: [
"dialogue:stat_trainer_marley.encounter.1",
"dialogue:stat_trainer_marley.encounter.2"
],
victory: [
"dialogue:stat_trainer_marley.victory.1"
],
defeat: [
"dialogue:stat_trainer_marley.defeat.1"
]
}
],
[TrainerType.MIRA]: [
{
encounter: [
"dialogue:stat_trainer_mira.encounter.1",
"dialogue:stat_trainer_mira.encounter.2"
],
victory: [
"dialogue:stat_trainer_mira.victory.1"
],
defeat: [
"dialogue:stat_trainer_mira.defeat.1"
]
}
],
[TrainerType.RILEY]: [
{
encounter: [
"dialogue:stat_trainer_riley.encounter.1",
"dialogue:stat_trainer_riley.encounter.2"
],
victory: [
"dialogue:stat_trainer_riley.victory.1"
],
defeat: [
"dialogue:stat_trainer_riley.defeat.1"
]
}
],
[TrainerType.BROCK]: { [TrainerType.BROCK]: {
encounter: [ encounter: [
"dialogue:brock.encounter.1", "dialogue:brock.encounter.1",

13
src/data/egg.ts
View File

@ -60,13 +60,16 @@ export interface IEggOptions {
/** Defines if the egg will hatch with the hidden ability of this species. /** Defines if the egg will hatch with the hidden ability of this species.
* If no hidden ability exist, a random one will get choosen. * If no hidden ability exist, a random one will get choosen.
*/ */
overrideHiddenAbility?: boolean overrideHiddenAbility?: boolean,
/** If Egg is of {@link EggSourceType.EVENT}, can customize the message displayed for where the egg was obtained */
eventEggTypeDescriptor?: string;
} }
export class Egg { export class Egg {
//// ////
// #region Privat properties // #region Private properties
//// ////
private _id: number; private _id: number;
@ -82,6 +85,8 @@ export class Egg {
private _overrideHiddenAbility: boolean; private _overrideHiddenAbility: boolean;
private _eventEggTypeDescriptor: string;
//// ////
// #endregion // #endregion
//// ////
@ -179,6 +184,8 @@ export class Egg {
this.increasePullStatistic(eggOptions.scene); this.increasePullStatistic(eggOptions.scene);
this.addEggToGameData(eggOptions.scene); this.addEggToGameData(eggOptions.scene);
} }
this._eventEggTypeDescriptor = eggOptions.eventEggTypeDescriptor ?? null;
} }
//// ////
@ -273,6 +280,8 @@ export class Egg {
return i18next.t("egg:gachaTypeShiny"); return i18next.t("egg:gachaTypeShiny");
case EggSourceType.GACHA_MOVE: case EggSourceType.GACHA_MOVE:
return i18next.t("egg:gachaTypeMove"); return i18next.t("egg:gachaTypeMove");
case EggSourceType.EVENT:
return this._eventEggTypeDescriptor ?? i18next.t("egg:eventType");
} }
} }

191
src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts Normal file
View File

@ -0,0 +1,191 @@
import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs, } from "#app/data/trainer-config";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { TrainerType } from "#enums/trainer-type";
import { Species } from "#enums/species";
import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
import { randSeedInt } from "#app/utils";
import i18next from "i18next";
import { PartyHealPhase } from "#app/phases";
import { IEggOptions } from "#app/data/egg";
import { EggSourceType } from "#enums/egg-source-types";
import { EggTier } from "#enums/egg-type";
/** the i18n namespace for the encounter */
const namespace = "mysteryEncounter:aTrainersTest";
/**
* A Trainer's Test encounter.
* @see {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/115 | GitHub Issue #115}
* @see For biome requirements check {@linkcode mysteryEncountersByBiome}
*/
export const ATrainersTestEncounter: IMysteryEncounter =
MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.A_TRAINERS_TEST)
.withEncounterTier(MysteryEncounterTier.ROGUE)
.withSceneWaveRangeRequirement(10, 180) // waves 10 to 180
.withIntroSpriteConfigs([]) // These are set in onInit()
.withIntroDialogue([
{
text: `${namespace}.intro`,
},
])
.withAutoHideIntroVisuals(false)
.withOnInit((scene: BattleScene) => {
const encounter = scene.currentBattle.mysteryEncounter;
// Randomly pick from 1 of the 5 stat trainers to spawn
let trainerType: TrainerType;
let spriteKeys;
let trainerNameKey: string;
switch (randSeedInt(5)) {
default:
case 0:
trainerType = TrainerType.BUCK;
spriteKeys = getSpriteKeysFromSpecies(Species.CLAYDOL);
trainerNameKey = "buck";
break;
case 1:
trainerType = TrainerType.CHERYL;
spriteKeys = getSpriteKeysFromSpecies(Species.BLISSEY);
trainerNameKey = "cheryl";
break;
case 2:
trainerType = TrainerType.MARLEY;
spriteKeys = getSpriteKeysFromSpecies(Species.ARCANINE);
trainerNameKey = "marley";
break;
case 3:
trainerType = TrainerType.MIRA;
spriteKeys = getSpriteKeysFromSpecies(Species.ALAKAZAM, false, 1);
trainerNameKey = "mira";
break;
case 4:
trainerType = TrainerType.RILEY;
spriteKeys = getSpriteKeysFromSpecies(Species.LUCARIO, false, 1);
trainerNameKey = "riley";
break;
}
// Dialogue and tokens for trainer
encounter.dialogue.intro = [
{
speaker: `trainerNames:${trainerNameKey}`,
text: `${namespace}.${trainerNameKey}.intro_dialogue`
}
];
encounter.options[0].dialogue.selected = [
{
speaker: `trainerNames:${trainerNameKey}`,
text: `${namespace}.${trainerNameKey}.accept`
}
];
encounter.options[1].dialogue.selected = [
{
speaker: `trainerNames:${trainerNameKey}`,
text: `${namespace}.${trainerNameKey}.decline`
}
];
encounter.setDialogueToken("statTrainerName", i18next.t(`trainerNames:${trainerNameKey}`));
const eggDescription = i18next.t(`${namespace}.title`) + ":\n" + i18next.t(`trainerNames:${trainerNameKey}`);
encounter.misc = { trainerType, trainerNameKey, trainerEggDescription: eggDescription };
// Trainer config
const trainerConfig = trainerConfigs[trainerType].copy();
const trainerSpriteKey = trainerConfig.getSpriteKey();
encounter.enemyPartyConfigs.push({
levelAdditiveMultiplier: 1,
trainerConfig: trainerConfig
});
encounter.spriteConfigs = [
{
spriteKey: spriteKeys.spriteKey,
fileRoot: spriteKeys.fileRoot,
hasShadow: true,
repeat: true,
isPokemon: true,
x: 22,
y: -2,
yShadow: -2
},
{
spriteKey: trainerSpriteKey,
fileRoot: "trainer",
hasShadow: true,
disableAnimation: true,
x: -24,
y: 4,
yShadow: 4
}
];
return true;
})
.withTitle(`${namespace}.title`)
.withDescription(`${namespace}.description`)
.withQuery(`${namespace}.query`)
.withIntroDialogue()
.withSimpleOption(
{
buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}.option.1.tooltip`
},
async (scene: BattleScene) => {
const encounter = scene.currentBattle.mysteryEncounter;
// Spawn standard trainer battle with memory mushroom reward
const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
let eggTier;
if (randSeedInt(64) >= 54) {
eggTier = EggTier.MASTER;
} else {
eggTier = EggTier.ULTRA;
}
await transitionMysteryEncounterIntroVisuals(scene);
const eggOptions: IEggOptions = {
scene,
pulled: false,
sourceType: EggSourceType.EVENT,
eventEggTypeDescriptor: encounter.misc.trainerEggDescription,
tier: eggTier
};
encounter.setDialogueToken("eggType", i18next.t(`${namespace}.eggTypes.${eggTier === EggTier.ULTRA ? "epic" : "legendary"}`));
setEncounterRewards(scene, { fillRemaining: true }, [eggOptions]);
return initBattleWithEnemyConfig(scene, config);
}
)
.withSimpleOption(
{
buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}.option.2.tooltip`
},
async (scene: BattleScene) => {
const encounter = scene.currentBattle.mysteryEncounter;
// Full heal party
scene.unshiftPhase(new PartyHealPhase(scene, true));
const eggOptions: IEggOptions = {
scene,
pulled: false,
sourceType: EggSourceType.EVENT,
eventEggTypeDescriptor: encounter.misc.trainerEggDescription,
tier: EggTier.GREAT
};
encounter.setDialogueToken("eggType", i18next.t(`${namespace}.eggTypes.rare`));
setEncounterRewards(scene, { fillRemaining: false, rerollMultiplier: 0 }, [eggOptions]);
leaveEncounterWithoutBattle(scene);
}
)
.withOutroDialogue([
{
text: `${namespace}:outro`,
},
])
.build();

58
src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
View File

@ -1,5 +1,5 @@
import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { PokemonMove } from "#app/field/pokemon"; import Pokemon, { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
import { BerryModifierType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { BerryModifierType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species"; import { Species } from "#enums/species";
@ -37,18 +37,20 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
.withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Must have at least 4 berries to spawn .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Must have at least 4 berries to spawn
.withIntroSpriteConfigs([ .withIntroSpriteConfigs([
{ {
spriteKey: Species.GREEDENT.toString(), // This sprite has the shadow
fileRoot: "pokemon", spriteKey: null,
hasShadow: false, fileRoot: null,
species: Species.GREEDENT,
hasShadow: true,
alpha: 0.001,
repeat: true, repeat: true,
x: -5 x: -5
}, },
{ {
// This sprite has the shadow spriteKey: null,
spriteKey: Species.GREEDENT.toString(), fileRoot: null,
fileRoot: "pokemon", species: Species.GREEDENT,
hasShadow: true, hasShadow: false,
alpha: 0.001,
repeat: true, repeat: true,
x: -5 x: -5
}, },
@ -162,12 +164,12 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
}) })
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
} }
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
const encounter = scene.currentBattle.mysteryEncounter; const encounter = scene.currentBattle.mysteryEncounter;
@ -213,7 +215,7 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
modifierTypes: bossModifierTypes, modifierTypes: bossModifierTypes,
tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
mysteryEncounterBattleEffects: (pokemon: Pokemon) => { mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
queueEncounterMessage(pokemon.scene, `${namespace}:option:1:boss_enraged`); queueEncounterMessage(pokemon.scene, `${namespace}.option.1.boss_enraged`);
pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD], 1)); pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD], 1));
} }
} }
@ -228,11 +230,11 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}) })
@ -248,7 +250,7 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
const seedModifier = revSeed.newModifier(p); const seedModifier = revSeed.newModifier(p);
scene.addModifier(seedModifier, false, false, false, true); scene.addModifier(seedModifier, false, false, false, true);
}); });
queueEncounterMessage(scene, `${namespace}:option:1:food_stash`); queueEncounterMessage(scene, `${namespace}.option.1.food_stash`);
}; };
setEncounterRewards(scene, { fillRemaining: true }, null, givePartyPokemonReviverSeeds); setEncounterRewards(scene, { fillRemaining: true }, null, givePartyPokemonReviverSeeds);
@ -269,11 +271,11 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}) })
@ -310,11 +312,11 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}) })
@ -328,7 +330,7 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter =
// Let it have the food // Let it have the food
// Greedent joins the team, level equal to 2 below highest party member // Greedent joins the team, level equal to 2 below highest party member
const level = getHighestLevelPlayerPokemon(scene).level - 2; const level = getHighestLevelPlayerPokemon(scene).level - 2;
const greedent = scene.addEnemyPokemon(getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false); const greedent = new EnemyPokemon(scene, getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false, null);
greedent.moveset = [new PokemonMove(Moves.THRASH), new PokemonMove(Moves.BODY_PRESS), new PokemonMove(Moves.STUFF_CHEEKS), new PokemonMove(Moves.SLACK_OFF)]; greedent.moveset = [new PokemonMove(Moves.THRASH), new PokemonMove(Moves.BODY_PRESS), new PokemonMove(Moves.STUFF_CHEEKS), new PokemonMove(Moves.SLACK_OFF)];
greedent.passive = true; greedent.passive = true;
@ -344,7 +346,7 @@ function doGreedentSpriteSteal(scene: BattleScene) {
const shakeDelay = 50; const shakeDelay = 50;
const slideDelay = 500; const slideDelay = 500;
const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(0); const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(1);
scene.playSound("Follow Me"); scene.playSound("Follow Me");
scene.tweens.chain({ scene.tweens.chain({
@ -418,7 +420,7 @@ function doGreedentSpriteSteal(scene: BattleScene) {
} }
function doGreedentEatBerries(scene: BattleScene) { function doGreedentEatBerries(scene: BattleScene) {
const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(0); const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(1);
let index = 1; let index = 1;
scene.tweens.add({ scene.tweens.add({
targets: greedentSprites, targets: greedentSprites,
@ -452,7 +454,7 @@ function doBerrySpritePile(scene: BattleScene, isEat: boolean = false) {
} }
const encounter = scene.currentBattle.mysteryEncounter; const encounter = scene.currentBattle.mysteryEncounter;
animationOrder.forEach((berry, i) => { animationOrder.forEach((berry, i) => {
const introVisualsIndex = encounter.spriteConfigs.findIndex(config => config.spriteKey.includes(berry)); const introVisualsIndex = encounter.spriteConfigs.findIndex(config => config.spriteKey?.includes(berry));
const [ sprite, tintSprite ] = encounter.introVisuals.getSpriteAtIndex(introVisualsIndex); const [ sprite, tintSprite ] = encounter.introVisuals.getSpriteAtIndex(introVisualsIndex);
scene.time.delayedCall(berryAddDelay * i + 400, () => { scene.time.delayedCall(berryAddDelay * i + 400, () => {
if (sprite) { if (sprite) {

42
src/data/mystery-encounters/encounters/offer-you-cant-refuse-encounter.ts → src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
View File

@ -21,8 +21,8 @@ const namespace = "mysteryEncounter:offerYouCantRefuse";
* @see {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/72 | GitHub Issue #72} * @see {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/72 | GitHub Issue #72}
* @see For biome requirements check {@linkcode mysteryEncountersByBiome} * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
*/ */
export const OfferYouCantRefuseEncounter: IMysteryEncounter = export const AnOfferYouCantRefuseEncounter: IMysteryEncounter =
MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.OFFER_YOU_CANT_REFUSE) MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE)
.withEncounterTier(MysteryEncounterTier.GREAT) .withEncounterTier(MysteryEncounterTier.GREAT)
.withSceneWaveRangeRequirement(10, 180) .withSceneWaveRangeRequirement(10, 180)
.withScenePartySizeRequirement(2, 6) // Must have at least 2 pokemon in party .withScenePartySizeRequirement(2, 6) // Must have at least 2 pokemon in party
@ -47,16 +47,16 @@ export const OfferYouCantRefuseEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
{ {
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
const encounter = scene.currentBattle.mysteryEncounter; const encounter = scene.currentBattle.mysteryEncounter;
const pokemon = getHighestStatTotalPlayerPokemon(scene, false); const pokemon = getHighestStatTotalPlayerPokemon(scene, false);
@ -89,12 +89,12 @@ export const OfferYouCantRefuseEncounter: IMysteryEncounter =
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
], ],
}) })
@ -120,13 +120,13 @@ export const OfferYouCantRefuseEncounter: IMysteryEncounter =
new AbilityRequirement(EXTORTION_ABILITIES)) new AbilityRequirement(EXTORTION_ABILITIES))
) )
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
disabledButtonTooltip: `${namespace}:option:2:tooltip_disabled`, disabledButtonTooltip: `${namespace}.option.2.tooltip_disabled`,
selected: [ selected: [
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}) })
@ -144,12 +144,12 @@ export const OfferYouCantRefuseEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}, },

32
src/data/mystery-encounters/encounters/dark-deal-encounter.ts
View File

@ -92,32 +92,32 @@ export const DarkDealEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
}, },
]) ])
.withSceneWaveRangeRequirement(30, 180) // waves 30 to 180 .withSceneWaveRangeRequirement(30, 180) // waves 30 to 180
.withScenePartySizeRequirement(2, 6) // Must have at least 2 pokemon in party .withScenePartySizeRequirement(2, 6) // Must have at least 2 pokemon in party
.withCatchAllowed(true) .withCatchAllowed(true)
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption( .withOption(
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:option:1:selected_dialogue`, text: `${namespace}.option.1.selected_dialogue`,
}, },
{ {
text: `${namespace}:option:1:selected_message`, text: `${namespace}.option.1.selected_message`,
}, },
], ],
}) })
@ -164,12 +164,12 @@ export const DarkDealEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },
@ -181,7 +181,7 @@ export const DarkDealEncounter: IMysteryEncounter =
) )
.withOutroDialogue([ .withOutroDialogue([
{ {
text: `${namespace}:outro` text: `${namespace}.outro`
} }
]) ])
.build(); .build();

49
src/data/mystery-encounters/encounters/delibirdy-encounter.ts
View File

@ -47,23 +47,26 @@ export const DelibirdyEncounter: IMysteryEncounter =
)) ))
.withIntroSpriteConfigs([ .withIntroSpriteConfigs([
{ {
spriteKey: Species.DELIBIRD.toString(), spriteKey: null,
fileRoot: "pokemon", fileRoot: null,
species: Species.DELIBIRD,
hasShadow: true, hasShadow: true,
repeat: true, repeat: true,
startFrame: 38, startFrame: 38,
scale: 0.94 scale: 0.94
}, },
{ {
spriteKey: Species.DELIBIRD.toString(), spriteKey: null,
fileRoot: "pokemon", fileRoot: null,
species: Species.DELIBIRD,
hasShadow: true, hasShadow: true,
repeat: true, repeat: true,
scale: 1.06 scale: 1.06
}, },
{ {
spriteKey: Species.DELIBIRD.toString(), spriteKey: null,
fileRoot: "pokemon", fileRoot: null,
species: Species.DELIBIRD,
hasShadow: true, hasShadow: true,
repeat: true, repeat: true,
startFrame: 65, startFrame: 65,
@ -74,15 +77,15 @@ export const DelibirdyEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
} }
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOutroDialogue([ .withOutroDialogue([
{ {
text: `${namespace}:outro`, text: `${namespace}.outro`,
} }
]) ])
.withOption( .withOption(
@ -90,11 +93,11 @@ export const DelibirdyEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withSceneMoneyRequirement(0, 2.75) // Must have money to spawn .withSceneMoneyRequirement(0, 2.75) // Must have money to spawn
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}) })
@ -127,12 +130,12 @@ export const DelibirdyEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS)) .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_2_ALLOWED_MODIFIERS))
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
secondOptionPrompt: `${namespace}:option:2:select_prompt`, secondOptionPrompt: `${namespace}.option.2.select_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}) })
@ -222,12 +225,12 @@ export const DelibirdyEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true)) .withPrimaryPokemonRequirement(new HeldItemRequirement(OPTION_3_DISALLOWED_MODIFIERS, 1, true))
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
secondOptionPrompt: `${namespace}:option:3:select_prompt`, secondOptionPrompt: `${namespace}.option.3.select_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}) })
@ -261,7 +264,7 @@ export const DelibirdyEncounter: IMysteryEncounter =
// If pokemon meets primary pokemon reqs, it can be selected // If pokemon meets primary pokemon reqs, it can be selected
const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(scene, pokemon); const meetsReqs = encounter.options[2].pokemonMeetsPrimaryRequirements(scene, pokemon);
if (!meetsReqs) { if (!meetsReqs) {
return getEncounterText(scene, `${namespace}:invalid_selection`); return getEncounterText(scene, `${namespace}.invalid_selection`);
} }
return null; return null;

35
src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
View File

@ -32,8 +32,9 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter =
x: -20, x: -20,
}, },
{ {
spriteKey: Species.FURFROU.toString(), spriteKey: null,
fileRoot: "pokemon", fileRoot: null,
species: Species.FURFROU,
hasShadow: true, hasShadow: true,
repeat: true, repeat: true,
x: 30, x: 30,
@ -41,21 +42,21 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
{ {
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]) ])
.withAutoHideIntroVisuals(false) .withAutoHideIntroVisuals(false)
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
}, },
async (scene: BattleScene) => { async (scene: BattleScene) => {
// Choose TMs // Choose TMs
@ -80,8 +81,8 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
}, },
async (scene: BattleScene) => { async (scene: BattleScene) => {
// Choose Vitamins // Choose Vitamins
@ -104,8 +105,8 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
}, },
async (scene: BattleScene) => { async (scene: BattleScene) => {
// Choose X Items // Choose X Items
@ -128,8 +129,8 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:4:label`, buttonLabel: `${namespace}.option.4.label`,
buttonTooltip: `${namespace}:option:4:tooltip`, buttonTooltip: `${namespace}.option.4.tooltip`,
}, },
async (scene: BattleScene) => { async (scene: BattleScene) => {
// Choose Pokeballs // Choose Pokeballs
@ -156,7 +157,7 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter =
) )
.withOutroDialogue([ .withOutroDialogue([
{ {
text: `${namespace}:outro`, text: `${namespace}.outro`,
} }
]) ])
.build(); .build();

88
src/data/mystery-encounters/encounters/field-trip-encounter.ts
View File

@ -42,27 +42,27 @@ export const FieldTripEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
{ {
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]) ])
.withAutoHideIntroVisuals(false) .withAutoHideIntroVisuals(false)
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption( .withOption(
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
secondOptionPrompt: `${namespace}:second_option_prompt`, secondOptionPrompt: `${namespace}.second_option_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -80,17 +80,17 @@ export const FieldTripEncounter: IMysteryEncounter =
if (!correctMove) { if (!correctMove) {
encounter.options[0].dialogue.selected = [ encounter.options[0].dialogue.selected = [
{ {
text: `${namespace}:option:incorrect`, text: `${namespace}.option.incorrect`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
{ {
text: `${namespace}:option:lesson_learned`, text: `${namespace}.option.lesson_learned`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_bad`, text: `${namespace}.outro_bad`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
setEncounterExp(scene, scene.getParty().map((p) => p.id), 50); setEncounterExp(scene, scene.getParty().map((p) => p.id), 50);
@ -99,13 +99,13 @@ export const FieldTripEncounter: IMysteryEncounter =
encounter.setDialogueToken("move", move.getName()); encounter.setDialogueToken("move", move.getName());
encounter.options[0].dialogue.selected = [ encounter.options[0].dialogue.selected = [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_good`, text: `${namespace}.outro_good`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
setEncounterExp(scene, [pokemon.id], 100); setEncounterExp(scene, [pokemon.id], 100);
@ -143,12 +143,12 @@ export const FieldTripEncounter: IMysteryEncounter =
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
secondOptionPrompt: `${namespace}:second_option_prompt`, secondOptionPrompt: `${namespace}.second_option_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -166,23 +166,23 @@ export const FieldTripEncounter: IMysteryEncounter =
if (!correctMove) { if (!correctMove) {
encounter.options[1].dialogue.selected = [ encounter.options[1].dialogue.selected = [
{ {
text: `${namespace}:option:incorrect`, text: `${namespace}.option.incorrect`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
{ {
text: `${namespace}:option:lesson_learned`, text: `${namespace}.option.lesson_learned`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_bad`, text: `${namespace}.outro_bad`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_bad`, text: `${namespace}.outro_bad`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
setEncounterExp(scene, scene.getParty().map((p) => p.id), 50); setEncounterExp(scene, scene.getParty().map((p) => p.id), 50);
@ -191,13 +191,13 @@ export const FieldTripEncounter: IMysteryEncounter =
encounter.setDialogueToken("move", move.getName()); encounter.setDialogueToken("move", move.getName());
encounter.options[1].dialogue.selected = [ encounter.options[1].dialogue.selected = [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_good`, text: `${namespace}.outro_good`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
setEncounterExp(scene, [pokemon.id], 100); setEncounterExp(scene, [pokemon.id], 100);
@ -235,12 +235,12 @@ export const FieldTripEncounter: IMysteryEncounter =
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
secondOptionPrompt: `${namespace}:second_option_prompt`, secondOptionPrompt: `${namespace}.second_option_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -258,17 +258,17 @@ export const FieldTripEncounter: IMysteryEncounter =
if (!correctMove) { if (!correctMove) {
encounter.options[2].dialogue.selected = [ encounter.options[2].dialogue.selected = [
{ {
text: `${namespace}:option:incorrect`, text: `${namespace}.option.incorrect`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
{ {
text: `${namespace}:option:lesson_learned`, text: `${namespace}.option.lesson_learned`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_bad`, text: `${namespace}.outro_bad`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
setEncounterExp(scene, scene.getParty().map((p) => p.id), 50); setEncounterExp(scene, scene.getParty().map((p) => p.id), 50);
@ -277,13 +277,13 @@ export const FieldTripEncounter: IMysteryEncounter =
encounter.setDialogueToken("move", move.getName()); encounter.setDialogueToken("move", move.getName());
encounter.options[2].dialogue.selected = [ encounter.options[2].dialogue.selected = [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
]; ];
encounter.dialogue.outro = [ encounter.dialogue.outro = [
{ {
text: `${namespace}:outro_good`, text: `${namespace}.outro_good`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]; ];
setEncounterExp(scene, [pokemon.id], 100); setEncounterExp(scene, [pokemon.id], 100);

53
src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
View File

@ -1,5 +1,5 @@
import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, initCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { AttackTypeBoosterModifierType, modifierTypes, } from "#app/modifier/modifier-type"; import { AttackTypeBoosterModifierType, modifierTypes, } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
@ -46,7 +46,7 @@ export const FieryFalloutEncounter: IMysteryEncounter =
.withAutoHideIntroVisuals(false) .withAutoHideIntroVisuals(false)
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
]) ])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
@ -75,8 +75,9 @@ export const FieryFalloutEncounter: IMysteryEncounter =
// Load hidden Volcarona sprites // Load hidden Volcarona sprites
encounter.spriteConfigs = [ encounter.spriteConfigs = [
{ {
spriteKey: volcaronaSpecies.getSpriteId(false), spriteKey: null,
fileRoot: "pokemon", fileRoot: null,
species: Species.VOLCARONA,
repeat: true, repeat: true,
hidden: true, hidden: true,
hasShadow: true, hasShadow: true,
@ -84,8 +85,9 @@ export const FieryFalloutEncounter: IMysteryEncounter =
startFrame: 20 startFrame: 20
}, },
{ {
spriteKey: volcaronaSpecies.getSpriteId(true ), spriteKey: null,
fileRoot: "pokemon", fileRoot: null,
species: Species.VOLCARONA,
repeat: true, repeat: true,
hidden: true, hidden: true,
hasShadow: true, hasShadow: true,
@ -94,7 +96,7 @@ export const FieryFalloutEncounter: IMysteryEncounter =
]; ];
// Load animations/sfx for Volcarona moves // Load animations/sfx for Volcarona moves
initCustomMovesForEncounter(scene, [Moves.FIRE_SPIN, Moves.QUIVER_DANCE]); loadCustomMovesForEncounter(scene, [Moves.FIRE_SPIN, Moves.QUIVER_DANCE]);
scene.arena.trySetWeather(WeatherType.SUNNY, true); scene.arena.trySetWeather(WeatherType.SUNNY, true);
@ -115,28 +117,23 @@ export const FieryFalloutEncounter: IMysteryEncounter =
return true; return true;
}) })
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}, },
async (scene: BattleScene) => { async (scene: BattleScene) => {
// Pick battle // Pick battle
const encounter = scene.currentBattle.mysteryEncounter; const encounter = scene.currentBattle.mysteryEncounter;
setEncounterRewards(scene, setEncounterRewards(scene, { fillRemaining: true }, null, () => giveLeadPokemonCharcoal(scene));
{ fillRemaining: true },
null,
() => {
giveLeadPokemonCharcoal(scene);
});
encounter.startOfBattleEffects.push( encounter.startOfBattleEffects.push(
{ {
@ -168,11 +165,11 @@ export const FieryFalloutEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },
@ -195,7 +192,7 @@ export const FieryFalloutEncounter: IMysteryEncounter =
if (chosenPokemon.trySetStatus(StatusEffect.BURN)) { if (chosenPokemon.trySetStatus(StatusEffect.BURN)) {
// Burn applied // Burn applied
encounter.setDialogueToken("burnedPokemon", chosenPokemon.name); encounter.setDialogueToken("burnedPokemon", chosenPokemon.name);
queueEncounterMessage(scene, `${namespace}:option:2:target_burned`); queueEncounterMessage(scene, `${namespace}.option.2.target_burned`);
} }
} }
@ -209,12 +206,12 @@ export const FieryFalloutEncounter: IMysteryEncounter =
.withPrimaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3PrimaryName dialogue token automatically .withPrimaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3PrimaryName dialogue token automatically
.withSecondaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3SecondaryName dialogue token automatically .withSecondaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3SecondaryName dialogue token automatically
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
disabledButtonTooltip: `${namespace}:option:3:disabled_tooltip`, disabledButtonTooltip: `${namespace}.option.3.disabled_tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}) })
@ -249,6 +246,6 @@ function giveLeadPokemonCharcoal(scene: BattleScene) {
const charcoal = generateModifierTypeOption(scene, modifierTypes.ATTACK_TYPE_BOOSTER, [Type.FIRE]).type as AttackTypeBoosterModifierType; const charcoal = generateModifierTypeOption(scene, modifierTypes.ATTACK_TYPE_BOOSTER, [Type.FIRE]).type as AttackTypeBoosterModifierType;
applyModifierTypeToPlayerPokemon(scene, leadPokemon, charcoal); applyModifierTypeToPlayerPokemon(scene, leadPokemon, charcoal);
scene.currentBattle.mysteryEncounter.setDialogueToken("leadPokemon", leadPokemon.name); scene.currentBattle.mysteryEncounter.setDialogueToken("leadPokemon", leadPokemon.name);
queueEncounterMessage(scene, `${namespace}:found_charcoal`); queueEncounterMessage(scene, `${namespace}.found_charcoal`);
} }
} }

55
src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
View File

@ -7,7 +7,7 @@ import {
setEncounterRewards setEncounterRewards
} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
import Pokemon from "#app/field/pokemon"; import Pokemon, { EnemyPokemon } from "#app/field/pokemon";
import { ModifierTier } from "#app/modifier/modifier-tier"; import { ModifierTier } from "#app/modifier/modifier-tier";
import { import {
getPartyLuckValue, getPartyLuckValue,
@ -27,6 +27,9 @@ import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-enco
import { getPokemonNameWithAffix } from "#app/messages"; import { getPokemonNameWithAffix } from "#app/messages";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { TrainerSlot } from "#app/data/trainer-config";
import { getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
import PokemonData from "#app/system/pokemon-data";
/** the i18n namespace for the encounter */ /** the i18n namespace for the encounter */
const namespace = "mysteryEncounter:fightOrFlight"; const namespace = "mysteryEncounter:fightOrFlight";
@ -45,7 +48,7 @@ export const FightOrFlightEncounter: IMysteryEncounter =
.withIntroSpriteConfigs([]) // Set in onInit() .withIntroSpriteConfigs([]) // Set in onInit()
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
]) ])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
@ -53,9 +56,14 @@ export const FightOrFlightEncounter: IMysteryEncounter =
// Calculate boss mon // Calculate boss mon
const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, scene.currentBattle.waveIndex, 0, getPartyLuckValue(scene.getParty()), true); const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, scene.currentBattle.waveIndex, 0, getPartyLuckValue(scene.getParty()), true);
const bossPokemon = new EnemyPokemon(scene, bossSpecies, scene.currentBattle.waveIndex, TrainerSlot.NONE, true, null);
const config: EnemyPartyConfig = { const config: EnemyPartyConfig = {
levelAdditiveMultiplier: 1, levelAdditiveMultiplier: 1,
pokemonConfigs: [{ species: bossSpecies, isBoss: true }], pokemonConfigs: [{
species: bossSpecies,
dataSource: new PokemonData(bossPokemon),
isBoss: true
}],
}; };
encounter.enemyPartyConfigs = [config]; encounter.enemyPartyConfigs = [config];
@ -74,7 +82,7 @@ export const FightOrFlightEncounter: IMysteryEncounter =
encounter.setDialogueToken("itemName", item.type.name); encounter.setDialogueToken("itemName", item.type.name);
encounter.misc = item; encounter.misc = item;
const bossSpriteKey = bossSpecies.getSpriteId(false, bossSpecies.forms ? 0 : null, false, bossSpecies.hasVariants() ? 0 : null); const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon);
encounter.spriteConfigs = [ encounter.spriteConfigs = [
{ {
spriteKey: item.type.iconImage, spriteKey: item.type.iconImage,
@ -87,12 +95,13 @@ export const FightOrFlightEncounter: IMysteryEncounter =
disableAnimation: true disableAnimation: true
}, },
{ {
spriteKey: bossSpriteKey, spriteKey: spriteKey,
fileRoot: "pokemon", fileRoot: fileRoot,
hasShadow: true, hasShadow: true,
tint: 0.25, tint: 0.25,
x: -5, x: -5,
repeat: true, repeat: true,
isPokemon: true
}, },
]; ];
@ -101,23 +110,23 @@ export const FightOrFlightEncounter: IMysteryEncounter =
const primaryPokemon = encounter.options[1].primaryPokemon; const primaryPokemon = encounter.options[1].primaryPokemon;
if (primaryPokemon) { if (primaryPokemon) {
// Use primaryPokemon to execute the thievery // Use primaryPokemon to execute the thievery
encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip_special`; encounter.options[1].dialogue.buttonTooltip = `${namespace}.option.2.tooltip_special`;
} else { } else {
encounter.options[1].dialogue.buttonTooltip = `${namespace}:option:2:tooltip`; encounter.options[1].dialogue.buttonTooltip = `${namespace}.option.2.tooltip`;
} }
return true; return true;
}) })
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}, },
@ -134,8 +143,8 @@ export const FightOrFlightEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL) .withOptionMode(MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL)
.withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES)) // Will set option2PrimaryName and option2PrimaryMove dialogue tokens automatically
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
}) })
.withOptionPhase(async (scene: BattleScene) => { .withOptionPhase(async (scene: BattleScene) => {
// Pick steal // Pick steal
@ -147,7 +156,7 @@ export const FightOrFlightEncounter: IMysteryEncounter =
const primaryPokemon = encounter.options[1].primaryPokemon; const primaryPokemon = encounter.options[1].primaryPokemon;
if (primaryPokemon) { if (primaryPokemon) {
// Use primaryPokemon to execute the thievery // Use primaryPokemon to execute the thievery
await showEncounterText(scene, `${namespace}:option:2:special_result`); await showEncounterText(scene, `${namespace}.option.2.special_result`);
setEncounterExp(scene, primaryPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs[0].species.baseExp, true); setEncounterExp(scene, primaryPokemon.id, encounter.enemyPartyConfigs[0].pokemonConfigs[0].species.baseExp, true);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
return; return;
@ -160,15 +169,15 @@ export const FightOrFlightEncounter: IMysteryEncounter =
config.pokemonConfigs[0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON]; config.pokemonConfigs[0].tags = [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON];
config.pokemonConfigs[0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => { config.pokemonConfigs[0].mysteryEncounterBattleEffects = (pokemon: Pokemon) => {
pokemon.scene.currentBattle.mysteryEncounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(pokemon)); pokemon.scene.currentBattle.mysteryEncounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(pokemon));
queueEncounterMessage(pokemon.scene, `${namespace}option:2:boss_enraged`); queueEncounterMessage(pokemon.scene, `${namespace}option.2.boss_enraged`);
pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD], 1)); pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.SPD], 1));
}; };
await showEncounterText(scene, `${namespace}:option:2:bad_result`); await showEncounterText(scene, `${namespace}.option.2.bad_result`);
await initBattleWithEnemyConfig(scene, config); await initBattleWithEnemyConfig(scene, config);
} else { } else {
// Steal item (37.5%) // Steal item (37.5%)
// Display result message then proceed to rewards // Display result message then proceed to rewards
await showEncounterText(scene, `${namespace}:option:2:good_result`); await showEncounterText(scene, `${namespace}.option.2.good_result`);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
} }
}) })
@ -176,11 +185,11 @@ export const FightOrFlightEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}, },

38
src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
View File

@ -31,14 +31,14 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
.withSceneWaveRangeRequirement(11, 179) .withSceneWaveRangeRequirement(11, 179)
.withIntroSpriteConfigs([ .withIntroSpriteConfigs([
{ {
fileRoot: "mystery-encounters",
spriteKey: "buoy", spriteKey: "buoy",
fileRoot: "mystery-encounters",
hasShadow: false, hasShadow: false,
x: 20, x: 20,
y: 3, y: 3,
}, },
]) ])
.withIntroDialogue([{ text: `${namespace}:intro` }]) .withIntroDialogue([{ text: `${namespace}.intro` }])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
const { mysteryEncounter } = scene.currentBattle; const { mysteryEncounter } = scene.currentBattle;
@ -48,22 +48,22 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
return true; return true;
}) })
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption( .withOption(
// Option 1: Use a (non fainted) pokemon that can learn Surf to guide you back/ // Option 1: Use a (non fainted) pokemon that can learn Surf to guide you back/
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withPokemonCanLearnMoveRequirement(OPTION_1_REQUIRED_MOVE) .withPokemonCanLearnMoveRequirement(OPTION_1_REQUIRED_MOVE)
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
disabledButtonLabel: `${namespace}:option:1:label_disabled`, disabledButtonLabel: `${namespace}.option.1.label_disabled`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
disabledButtonTooltip: `${namespace}:option:1:tooltip_disabled`, disabledButtonTooltip: `${namespace}.option.1.tooltip_disabled`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}) })
@ -76,13 +76,13 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
.withPokemonCanLearnMoveRequirement(OPTION_2_REQUIRED_MOVE) .withPokemonCanLearnMoveRequirement(OPTION_2_REQUIRED_MOVE)
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
disabledButtonLabel: `${namespace}:option:2:label_disabled`, disabledButtonLabel: `${namespace}.option.2.label_disabled`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
disabledButtonTooltip: `${namespace}:option:2:tooltip_disabled`, disabledButtonTooltip: `${namespace}.option.2.tooltip_disabled`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}) })
@ -92,11 +92,11 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
.withSimpleOption( .withSimpleOption(
// Option 3: Wander aimlessly // Option 3: Wander aimlessly
{ {
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}, },
@ -116,7 +116,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with
) )
.withOutroDialogue([ .withOutroDialogue([
{ {
text: `${namespace}:outro`, text: `${namespace}.outro`,
}, },
]) ])
.build(); .build();

28
src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
View File

@ -33,7 +33,7 @@ export const MysteriousChallengersEncounter: IMysteryEncounter =
.withIntroSpriteConfigs([]) // These are set in onInit() .withIntroSpriteConfigs([]) // These are set in onInit()
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
]) ])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
@ -122,16 +122,16 @@ export const MysteriousChallengersEncounter: IMysteryEncounter =
return true; return true;
}) })
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}, },
@ -152,11 +152,11 @@ export const MysteriousChallengersEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}, },
@ -177,11 +177,11 @@ export const MysteriousChallengersEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}, },
@ -205,7 +205,7 @@ export const MysteriousChallengersEncounter: IMysteryEncounter =
) )
.withOutroDialogue([ .withOutroDialogue([
{ {
text: `${namespace}:outro`, text: `${namespace}.outro`,
}, },
]) ])
.build(); .build();

30
src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
View File

@ -36,21 +36,21 @@ export const MysteriousChestEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
} }
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption( .withOption(
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}) })
@ -75,7 +75,7 @@ export const MysteriousChestEncounter: IMysteryEncounter =
], ],
}); });
// Display result message then proceed to rewards // Display result message then proceed to rewards
queueEncounterMessage(scene, `${namespace}:option:1:normal`); queueEncounterMessage(scene, `${namespace}.option.1.normal`);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
} else if (roll > 40) { } else if (roll > 40) {
// Choose between 3 ULTRA tier items (20%) // Choose between 3 ULTRA tier items (20%)
@ -87,7 +87,7 @@ export const MysteriousChestEncounter: IMysteryEncounter =
], ],
}); });
// Display result message then proceed to rewards // Display result message then proceed to rewards
queueEncounterMessage(scene, `${namespace}:option:1:good`); queueEncounterMessage(scene, `${namespace}.option.1.good`);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
} else if (roll > 36) { } else if (roll > 36) {
// Choose between 2 ROGUE tier items (4%) // Choose between 2 ROGUE tier items (4%)
@ -95,7 +95,7 @@ export const MysteriousChestEncounter: IMysteryEncounter =
guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE], guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE],
}); });
// Display result message then proceed to rewards // Display result message then proceed to rewards
queueEncounterMessage(scene, `${namespace}:option:1:great`); queueEncounterMessage(scene, `${namespace}.option.1.great`);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
} else if (roll > 35) { } else if (roll > 35) {
// Choose 1 MASTER tier item (1%) // Choose 1 MASTER tier item (1%)
@ -103,7 +103,7 @@ export const MysteriousChestEncounter: IMysteryEncounter =
guaranteedModifierTiers: [ModifierTier.MASTER], guaranteedModifierTiers: [ModifierTier.MASTER],
}); });
// Display result message then proceed to rewards // Display result message then proceed to rewards
queueEncounterMessage(scene, `${namespace}:option:1:amazing`); queueEncounterMessage(scene, `${namespace}.option.1.amazing`);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
} else { } else {
// Your highest level unfainted Pok<6F>mon gets OHKO. Progress with no rewards (35%) // Your highest level unfainted Pok<6F>mon gets OHKO. Progress with no rewards (35%)
@ -116,7 +116,7 @@ export const MysteriousChestEncounter: IMysteryEncounter =
scene.currentBattle.mysteryEncounter.setDialogueToken("pokeName", highestLevelPokemon.name); scene.currentBattle.mysteryEncounter.setDialogueToken("pokeName", highestLevelPokemon.name);
// Show which Pokemon was KOed, then leave encounter with no rewards // Show which Pokemon was KOed, then leave encounter with no rewards
// Does this synchronously so that game over doesn't happen over result message // Does this synchronously so that game over doesn't happen over result message
await showEncounterText(scene, `${namespace}:option:1:bad`).then(() => { await showEncounterText(scene, `${namespace}.option.1.bad`).then(() => {
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
}); });
} }
@ -125,11 +125,11 @@ export const MysteriousChestEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },

61
src/data/mystery-encounters/encounters/safari-zone-encounter.ts
View File

@ -36,31 +36,30 @@ export const SafariZoneEncounter: IMysteryEncounter =
.withSceneRequirement(new MoneyRequirement(0, 2.75)) // Cost equal to 1 Max Revive .withSceneRequirement(new MoneyRequirement(0, 2.75)) // Cost equal to 1 Max Revive
.withIntroSpriteConfigs([ .withIntroSpriteConfigs([
{ {
spriteKey: "chest_blue", spriteKey: "safari_zone",
fileRoot: "mystery-encounters", fileRoot: "mystery-encounters",
hasShadow: true, hasShadow: false,
x: 4, x: 4,
y: 10, y: 6
yShadow: 3
}, },
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption(new MysteryEncounterOptionBuilder() .withOption(new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withSceneRequirement(new MoneyRequirement(0, 2.75)) // Cost equal to 1 Max Revive .withSceneRequirement(new MoneyRequirement(0, 2.75)) // Cost equal to 1 Max Revive
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}) })
@ -86,11 +85,11 @@ export const SafariZoneEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },
@ -121,11 +120,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:safari:1:label`, buttonLabel: `${namespace}.safari.1.label`,
buttonTooltip: `${namespace}:safari:1:tooltip`, buttonTooltip: `${namespace}.safari.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:safari:1:selected`, text: `${namespace}.safari.1.selected`,
} }
], ],
}) })
@ -154,11 +153,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:safari:2:label`, buttonLabel: `${namespace}.safari.2.label`,
buttonTooltip: `${namespace}:safari:2:tooltip`, buttonTooltip: `${namespace}.safari.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:safari:2:selected`, text: `${namespace}.safari.2.selected`,
}, },
], ],
}) })
@ -172,9 +171,9 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
// 80% chance to increase flee stage +1 // 80% chance to increase flee stage +1
const fleeChangeResult = tryChangeFleeStage(scene, 1, 8); const fleeChangeResult = tryChangeFleeStage(scene, 1, 8);
if (!fleeChangeResult) { if (!fleeChangeResult) {
await showEncounterText(scene, getEncounterText(scene, `${namespace}:safari:busy_eating`), 1000, false ); await showEncounterText(scene, getEncounterText(scene, `${namespace}.safari.busy_eating`), 1000, false );
} else { } else {
await showEncounterText(scene, getEncounterText(scene, `${namespace}:safari:eating`), 1000, false); await showEncounterText(scene, getEncounterText(scene, `${namespace}.safari.eating`), 1000, false);
} }
await doEndTurn(scene, 1); await doEndTurn(scene, 1);
@ -184,11 +183,11 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:safari:3:label`, buttonLabel: `${namespace}.safari.3.label`,
buttonTooltip: `${namespace}:safari:3:tooltip`, buttonTooltip: `${namespace}.safari.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:safari:3:selected`, text: `${namespace}.safari.3.selected`,
}, },
], ],
}) })
@ -201,9 +200,9 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
// 80% chance to decrease catch stage -1 // 80% chance to decrease catch stage -1
const catchChangeResult = tryChangeCatchStage(scene, -1, 8); const catchChangeResult = tryChangeCatchStage(scene, -1, 8);
if (!catchChangeResult) { if (!catchChangeResult) {
await showEncounterText(scene, getEncounterText(scene, `${namespace}:safari:beside_itself_angry`), 1000, false ); await showEncounterText(scene, getEncounterText(scene, `${namespace}.safari.beside_itself_angry`), 1000, false );
} else { } else {
await showEncounterText(scene, getEncounterText(scene, `${namespace}:safari:angry`), 1000, false ); await showEncounterText(scene, getEncounterText(scene, `${namespace}.safari.angry`), 1000, false );
} }
await doEndTurn(scene, 2); await doEndTurn(scene, 2);
@ -213,8 +212,8 @@ const safariZoneGameOptions: MysteryEncounterOption[] = [
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:safari:4:label`, buttonLabel: `${namespace}.safari.4.label`,
buttonTooltip: `${namespace}:safari:4:tooltip`, buttonTooltip: `${namespace}.safari.4.tooltip`,
}) })
.withOptionPhase(async (scene: BattleScene) => { .withOptionPhase(async (scene: BattleScene) => {
// Flee option // Flee option
@ -237,7 +236,7 @@ async function summonSafariPokemon(scene: BattleScene) {
const encounter = scene.currentBattle.mysteryEncounter; const encounter = scene.currentBattle.mysteryEncounter;
// Message pokemon remaining // Message pokemon remaining
encounter.setDialogueToken("remainingCount", encounter.misc.safariPokemonRemaining); encounter.setDialogueToken("remainingCount", encounter.misc.safariPokemonRemaining);
scene.queueMessage(getEncounterText(scene, `${namespace}:safari:remaining_count`), null, true); scene.queueMessage(getEncounterText(scene, `${namespace}.safari.remaining_count`), null, true);
// Generate pokemon using safariPokemonRemaining so they are always the same pokemon no matter how many turns are taken // Generate pokemon using safariPokemonRemaining so they are always the same pokemon no matter how many turns are taken
// Safari pokemon roll twice on shiny and HA chances, but are otherwise normal // Safari pokemon roll twice on shiny and HA chances, but are otherwise normal
@ -491,7 +490,7 @@ async function doEndTurn(scene: BattleScene, cursorIndex: number) {
leaveEncounterWithoutBattle(scene, true); leaveEncounterWithoutBattle(scene, true);
} }
} else { } else {
scene.queueMessage(getEncounterText(scene, `${namespace}:safari:watching`), 0, null, 1000); scene.queueMessage(getEncounterText(scene, `${namespace}.safari.watching`), 0, null, 1000);
initSubsequentOptionSelect(scene, { overrideOptions: safariZoneGameOptions, startingCursorIndex: cursorIndex, hideDescription: true }); initSubsequentOptionSelect(scene, { overrideOptions: safariZoneGameOptions, startingCursorIndex: cursorIndex, hideDescription: true });
} }
} }

46
src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
View File

@ -49,26 +49,26 @@ export const ShadyVitaminDealerEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
{ {
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption( .withOption(
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withSceneMoneyRequirement(0, 2) // Wave scaling money multiplier of 2 .withSceneMoneyRequirement(0, 2) // Wave scaling money multiplier of 2
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -127,13 +127,13 @@ export const ShadyVitaminDealerEncounter: IMysteryEncounter =
if (randSeedInt(10) < 8) { if (randSeedInt(10) < 8) {
if (chosenPokemon.trySetStatus(StatusEffect.TOXIC)) { if (chosenPokemon.trySetStatus(StatusEffect.TOXIC)) {
// Toxic applied // Toxic applied
queueEncounterMessage(scene, `${namespace}:bad_poison`); queueEncounterMessage(scene, `${namespace}.bad_poison`);
} else { } else {
// Pokemon immune or something else prevents status // Pokemon immune or something else prevents status
queueEncounterMessage(scene, `${namespace}:damage_only`); queueEncounterMessage(scene, `${namespace}.damage_only`);
} }
} else { } else {
queueEncounterMessage(scene, `${namespace}:damage_only`); queueEncounterMessage(scene, `${namespace}.damage_only`);
} }
setEncounterExp(scene, [chosenPokemon.id], 100); setEncounterExp(scene, [chosenPokemon.id], 100);
@ -147,11 +147,11 @@ export const ShadyVitaminDealerEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
.withSceneMoneyRequirement(0, 5) // Wave scaling money multiplier of 5 .withSceneMoneyRequirement(0, 5) // Wave scaling money multiplier of 5
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -178,7 +178,7 @@ export const ShadyVitaminDealerEncounter: IMysteryEncounter =
// If pokemon meets primary pokemon reqs, it can be selected // If pokemon meets primary pokemon reqs, it can be selected
const meetsReqs = encounter.pokemonMeetsPrimaryRequirements(scene, pokemon); const meetsReqs = encounter.pokemonMeetsPrimaryRequirements(scene, pokemon);
if (!meetsReqs) { if (!meetsReqs) {
return getEncounterText(scene, `${namespace}:invalid_selection`); return getEncounterText(scene, `${namespace}.invalid_selection`);
} }
return null; return null;
@ -207,13 +207,13 @@ export const ShadyVitaminDealerEncounter: IMysteryEncounter =
if (randSeedInt(10) < 2) { if (randSeedInt(10) < 2) {
if (chosenPokemon.trySetStatus(StatusEffect.POISON)) { if (chosenPokemon.trySetStatus(StatusEffect.POISON)) {
// Poison applied // Poison applied
queueEncounterMessage(scene, `${namespace}:poison`); queueEncounterMessage(scene, `${namespace}.poison`);
} else { } else {
// Pokemon immune or something else prevents status // Pokemon immune or something else prevents status
queueEncounterMessage(scene, `${namespace}:no_bad_effects`); queueEncounterMessage(scene, `${namespace}.no_bad_effects`);
} }
} else { } else {
queueEncounterMessage(scene, `${namespace}:no_bad_effects`); queueEncounterMessage(scene, `${namespace}.no_bad_effects`);
} }
setEncounterExp(scene, [chosenPokemon.id], 100); setEncounterExp(scene, [chosenPokemon.id], 100);
@ -224,12 +224,12 @@ export const ShadyVitaminDealerEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
speaker: `${namespace}:speaker` speaker: `${namespace}.speaker`
} }
] ]
}, },

34
src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
View File

@ -7,7 +7,7 @@ import { StatusEffect } from "#app/data/status-effect";
import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter"; import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter";
import { MysteryEncounterOptionBuilder } from "../mystery-encounter-option"; import { MysteryEncounterOptionBuilder } from "../mystery-encounter-option";
import { MoveRequirement } from "../mystery-encounter-requirements"; import { MoveRequirement } from "../mystery-encounter-requirements";
import { EnemyPartyConfig, EnemyPokemonConfig, initBattleWithEnemyConfig, initCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils"; import { EnemyPartyConfig, EnemyPokemonConfig, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils";
import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
import { Moves } from "#enums/moves"; import { Moves } from "#enums/moves";
import { BattlerIndex } from "#app/battle"; import { BattlerIndex } from "#app/battle";
@ -44,7 +44,7 @@ export const SlumberingSnorlaxEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
]) ])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
@ -66,20 +66,20 @@ export const SlumberingSnorlaxEncounter: IMysteryEncounter =
encounter.enemyPartyConfigs = [config]; encounter.enemyPartyConfigs = [config];
// Load animations/sfx for Snorlax fight start moves // Load animations/sfx for Snorlax fight start moves
initCustomMovesForEncounter(scene, [Moves.SNORE]); loadCustomMovesForEncounter(scene, [Moves.SNORE]);
return true; return true;
}) })
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}, },
@ -105,11 +105,11 @@ export const SlumberingSnorlaxEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },
@ -117,7 +117,7 @@ export const SlumberingSnorlaxEncounter: IMysteryEncounter =
// Fall asleep waiting for Snorlax // Fall asleep waiting for Snorlax
// Full heal party // Full heal party
scene.unshiftPhase(new PartyHealPhase(scene, true)); scene.unshiftPhase(new PartyHealPhase(scene, true));
queueEncounterMessage(scene, `${namespace}:option:2:rest_result`); queueEncounterMessage(scene, `${namespace}.option.2.rest_result`);
leaveEncounterWithoutBattle(scene); leaveEncounterWithoutBattle(scene);
} }
) )
@ -126,12 +126,12 @@ export const SlumberingSnorlaxEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL) .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL)
.withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES)) .withPrimaryPokemonRequirement(new MoveRequirement(STEALING_MOVES))
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
disabledButtonTooltip: `${namespace}:option:3:disabled_tooltip`, disabledButtonTooltip: `${namespace}.option.3.disabled_tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected` text: `${namespace}.option.3.selected`
} }
] ]
}) })

45
src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts → src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
View File

@ -4,7 +4,7 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter"; import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter";
import { MoneyRequirement } from "../mystery-encounter-requirements"; import { MoneyRequirement } from "../mystery-encounter-requirements";
import { catchPokemon, getRandomSpeciesByStarterTier } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { catchPokemon, getRandomSpeciesByStarterTier, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
import { getPokemonSpecies, speciesStarters } from "#app/data/pokemon-species"; import { getPokemonSpecies, speciesStarters } from "#app/data/pokemon-species";
import { Species } from "#enums/species"; import { Species } from "#enums/species";
import { PokeballType } from "#app/data/pokeball"; import { PokeballType } from "#app/data/pokeball";
@ -25,8 +25,8 @@ const MAX_POKEMON_PRICE_MULTIPLIER = 6;
* @see {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/36 | GitHub Issue #36} * @see {@link https://github.com/AsdarDevelops/PokeRogue-Events/issues/36 | GitHub Issue #36}
* @see For biome requirements check {@linkcode mysteryEncountersByBiome} * @see For biome requirements check {@linkcode mysteryEncountersByBiome}
*/ */
export const PokemonSalesmanEncounter: IMysteryEncounter = export const ThePokemonSalesmanEncounter: IMysteryEncounter =
MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.POKEMON_SALESMAN) MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.THE_POKEMON_SALESMAN)
.withEncounterTier(MysteryEncounterTier.ULTRA) .withEncounterTier(MysteryEncounterTier.ULTRA)
.withSceneWaveRangeRequirement(10, 180) .withSceneWaveRangeRequirement(10, 180)
.withSceneRequirement(new MoneyRequirement(null, MAX_POKEMON_PRICE_MULTIPLIER)) // Some costs may not be as significant, this is the max you'd pay .withSceneRequirement(new MoneyRequirement(null, MAX_POKEMON_PRICE_MULTIPLIER)) // Some costs may not be as significant, this is the max you'd pay
@ -40,16 +40,16 @@ export const PokemonSalesmanEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
{ {
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
}, },
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
const encounter = scene.currentBattle.mysteryEncounter; const encounter = scene.currentBattle.mysteryEncounter;
@ -66,17 +66,16 @@ export const PokemonSalesmanEncounter: IMysteryEncounter =
// If no HA mon found or you roll 1%, give shiny Magikarp // If no HA mon found or you roll 1%, give shiny Magikarp
species = getPokemonSpecies(Species.MAGIKARP); species = getPokemonSpecies(Species.MAGIKARP);
const hiddenIndex = species.ability2 ? 2 : 1; const hiddenIndex = species.ability2 ? 2 : 1;
pokemon = scene.addPlayerPokemon(species, 5, hiddenIndex, species.formIndex, null, true); pokemon = new PlayerPokemon(scene, species, 5, hiddenIndex, species.formIndex, null, true, null, null, null, null);
} else { } else {
const hiddenIndex = species.ability2 ? 2 : 1; const hiddenIndex = species.ability2 ? 2 : 1;
pokemon = scene.addPlayerPokemon(species, 5, hiddenIndex, species.formIndex); pokemon = new PlayerPokemon(scene, species, 5, hiddenIndex, species.formIndex, null, null, null, null, null, null);
} }
const spriteKey = pokemon.getSpriteId(); const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
const spriteRoot = pokemon.getSpriteAtlasPath();
encounter.spriteConfigs.push({ encounter.spriteConfigs.push({
spriteKey: spriteKey, spriteKey: spriteKey,
fileRoot: spriteRoot, fileRoot: fileRoot,
hasShadow: true, hasShadow: true,
repeat: true, repeat: true,
isPokemon: true isPokemon: true
@ -89,8 +88,8 @@ export const PokemonSalesmanEncounter: IMysteryEncounter =
// Always max price for shiny (flip HA back to normal), and add special messaging // Always max price for shiny (flip HA back to normal), and add special messaging
priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER; priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER;
pokemon.abilityIndex = 0; pokemon.abilityIndex = 0;
encounter.dialogue.encounterOptionsDialogue.description = `${namespace}:description_shiny`; encounter.dialogue.encounterOptionsDialogue.description = `${namespace}.description_shiny`;
encounter.options[0].dialogue.buttonTooltip = `${namespace}:option:1:tooltip_shiny`; encounter.options[0].dialogue.buttonTooltip = `${namespace}.option.1.tooltip_shiny`;
} }
const price = scene.getWaveMoneyAmount(priceMultiplier); const price = scene.getWaveMoneyAmount(priceMultiplier);
encounter.setDialogueToken("purchasePokemon", pokemon.name); encounter.setDialogueToken("purchasePokemon", pokemon.name);
@ -110,11 +109,11 @@ export const PokemonSalesmanEncounter: IMysteryEncounter =
.withHasDexProgress(true) .withHasDexProgress(true)
.withSceneMoneyRequirement(null, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2 .withSceneMoneyRequirement(null, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected_message`, text: `${namespace}.option.1.selected_message`,
} }
], ],
}) })
@ -127,7 +126,7 @@ export const PokemonSalesmanEncounter: IMysteryEncounter =
updatePlayerMoney(scene, -price, true, false); updatePlayerMoney(scene, -price, true, false);
// Show dialogue // Show dialogue
await showEncounterDialogue(scene, `${namespace}:option:1:selected_dialogue`, `${namespace}:speaker`); await showEncounterDialogue(scene, `${namespace}.option.1.selected_dialogue`, `${namespace}.speaker`);
await transitionMysteryEncounterIntroVisuals(scene); await transitionMysteryEncounterIntroVisuals(scene);
// "Catch" purchased pokemon // "Catch" purchased pokemon
@ -141,11 +140,11 @@ export const PokemonSalesmanEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },

28
src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
View File

@ -1,4 +1,4 @@
import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, initCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes, PokemonHeldItemModifierType, } from "#app/modifier/modifier-type"; import { modifierTypes, PokemonHeldItemModifierType, } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
@ -55,7 +55,7 @@ export const TheStrongStuffEncounter: IMysteryEncounter =
]) // Set in onInit() ]) // Set in onInit()
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
}, },
]) ])
.withOnInit((scene: BattleScene) => { .withOnInit((scene: BattleScene) => {
@ -82,7 +82,7 @@ export const TheStrongStuffEncounter: IMysteryEncounter =
], ],
tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON], tags: [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON],
mysteryEncounterBattleEffects: (pokemon: Pokemon) => { mysteryEncounterBattleEffects: (pokemon: Pokemon) => {
queueEncounterMessage(pokemon.scene, `${namespace}:option:2:stat_boost`); queueEncounterMessage(pokemon.scene, `${namespace}.option.2.stat_boost`);
pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.DEF, BattleStat.SPDEF], 2)); pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [BattleStat.DEF, BattleStat.SPDEF], 2));
} }
} }
@ -91,20 +91,20 @@ export const TheStrongStuffEncounter: IMysteryEncounter =
encounter.enemyPartyConfigs = [config]; encounter.enemyPartyConfigs = [config];
initCustomMovesForEncounter(scene, [Moves.GASTRO_ACID, Moves.STEALTH_ROCK]); loadCustomMovesForEncounter(scene, [Moves.GASTRO_ACID, Moves.STEALTH_ROCK]);
return true; return true;
}) })
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected` text: `${namespace}.option.1.selected`
} }
] ]
}, },
@ -148,7 +148,7 @@ export const TheStrongStuffEncounter: IMysteryEncounter =
} }
encounter.setDialogueToken("highBstPokemon", highestBst.name); encounter.setDialogueToken("highBstPokemon", highestBst.name);
await showEncounterText(scene, `${namespace}:option:1:selected_2`, null, true); await showEncounterText(scene, `${namespace}.option.1.selected_2`, null, true);
setEncounterRewards(scene, { fillRemaining: true }); setEncounterRewards(scene, { fillRemaining: true });
leaveEncounterWithoutBattle(scene, true); leaveEncounterWithoutBattle(scene, true);
@ -157,11 +157,11 @@ export const TheStrongStuffEncounter: IMysteryEncounter =
) )
.withSimpleOption( .withSimpleOption(
{ {
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}, },

42
src/data/mystery-encounters/encounters/training-session-encounter.ts
View File

@ -46,22 +46,22 @@ export const TrainingSessionEncounter: IMysteryEncounter =
]) ])
.withIntroDialogue([ .withIntroDialogue([
{ {
text: `${namespace}:intro`, text: `${namespace}.intro`,
} }
]) ])
.withTitle(`${namespace}:title`) .withTitle(`${namespace}.title`)
.withDescription(`${namespace}:description`) .withDescription(`${namespace}.description`)
.withQuery(`${namespace}:query`) .withQuery(`${namespace}.query`)
.withOption( .withOption(
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withHasDexProgress(true) .withHasDexProgress(true)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -77,7 +77,7 @@ export const TrainingSessionEncounter: IMysteryEncounter =
const selectableFilter = (pokemon: Pokemon) => { const selectableFilter = (pokemon: Pokemon) => {
const meetsReqs = pokemon.isAllowedInBattle(); const meetsReqs = pokemon.isAllowedInBattle();
if (!meetsReqs) { if (!meetsReqs) {
return getEncounterText(scene, `${namespace}:invalid_selection`); return getEncounterText(scene, `${namespace}.invalid_selection`);
} }
return null; return null;
@ -182,7 +182,7 @@ export const TrainingSessionEncounter: IMysteryEncounter =
scene.addModifier(mod, true, false, false, true); scene.addModifier(mod, true, false, false, true);
} }
scene.updateModifiers(true); scene.updateModifiers(true);
queueEncounterMessage(scene, `${namespace}:option:1:finished`); queueEncounterMessage(scene, `${namespace}.option.1.finished`);
}; };
setEncounterRewards( setEncounterRewards(
@ -201,12 +201,12 @@ export const TrainingSessionEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withHasDexProgress(true) .withHasDexProgress(true)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
secondOptionPrompt: `${namespace}:option:2:select_prompt`, secondOptionPrompt: `${namespace}.option.2.select_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -237,7 +237,7 @@ export const TrainingSessionEncounter: IMysteryEncounter =
const selectableFilter = (pokemon: Pokemon) => { const selectableFilter = (pokemon: Pokemon) => {
const meetsReqs = pokemon.isAllowedInBattle(); const meetsReqs = pokemon.isAllowedInBattle();
if (!meetsReqs) { if (!meetsReqs) {
return getEncounterText(scene, `${namespace}:invalid_selection`); return getEncounterText(scene, `${namespace}.invalid_selection`);
} }
return null; return null;
@ -265,7 +265,7 @@ export const TrainingSessionEncounter: IMysteryEncounter =
scene.removePokemonFromPlayerParty(playerPokemon, false); scene.removePokemonFromPlayerParty(playerPokemon, false);
const onBeforeRewardsPhase = () => { const onBeforeRewardsPhase = () => {
queueEncounterMessage(scene, `${namespace}:option:2:finished`); queueEncounterMessage(scene, `${namespace}.option.2.finished`);
// Add the pokemon back to party with Nature change // Add the pokemon back to party with Nature change
playerPokemon.setNature(encounter.misc.chosenNature); playerPokemon.setNature(encounter.misc.chosenNature);
scene.gameData.setPokemonCaught(playerPokemon, false); scene.gameData.setPokemonCaught(playerPokemon, false);
@ -294,12 +294,12 @@ export const TrainingSessionEncounter: IMysteryEncounter =
.withOptionMode(MysteryEncounterOptionMode.DEFAULT) .withOptionMode(MysteryEncounterOptionMode.DEFAULT)
.withHasDexProgress(true) .withHasDexProgress(true)
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
secondOptionPrompt: `${namespace}:option:3:select_prompt`, secondOptionPrompt: `${namespace}.option.3.select_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:selected`, text: `${namespace}.option.selected`,
}, },
], ],
}) })
@ -339,7 +339,7 @@ export const TrainingSessionEncounter: IMysteryEncounter =
const selectableFilter = (pokemon: Pokemon) => { const selectableFilter = (pokemon: Pokemon) => {
const meetsReqs = pokemon.isAllowedInBattle(); const meetsReqs = pokemon.isAllowedInBattle();
if (!meetsReqs) { if (!meetsReqs) {
return getEncounterText(scene, `${namespace}:invalid_selection`); return getEncounterText(scene, `${namespace}.invalid_selection`);
} }
return null; return null;
@ -371,7 +371,7 @@ export const TrainingSessionEncounter: IMysteryEncounter =
scene.removePokemonFromPlayerParty(playerPokemon, false); scene.removePokemonFromPlayerParty(playerPokemon, false);
const onBeforeRewardsPhase = () => { const onBeforeRewardsPhase = () => {
queueEncounterMessage(scene, `${namespace}:option:3:finished`); queueEncounterMessage(scene, `${namespace}.option.3.finished`);
// Add the pokemon back to party with ability change // Add the pokemon back to party with ability change
const abilityIndex = encounter.misc.abilityIndex; const abilityIndex = encounter.misc.abilityIndex;
if (!!playerPokemon.getFusionSpeciesForm()) { if (!!playerPokemon.getFusionSpeciesForm()) {

18
src/data/mystery-encounters/mystery-encounter.ts
View File

@ -47,6 +47,7 @@ export default interface IMysteryEncounter {
encounterAnimations?: EncounterAnim[]; encounterAnimations?: EncounterAnim[];
hideBattleIntroMessage?: boolean; hideBattleIntroMessage?: boolean;
autoHideIntroVisuals?: boolean; autoHideIntroVisuals?: boolean;
enterIntroVisualsFromRight?: boolean;
catchAllowed?: boolean; catchAllowed?: boolean;
maxAllowedEncounters?: number; maxAllowedEncounters?: number;
@ -159,14 +160,15 @@ export default class IMysteryEncounter implements IMysteryEncounter {
if (!isNullOrUndefined(encounter)) { if (!isNullOrUndefined(encounter)) {
Object.assign(this, encounter); Object.assign(this, encounter);
} }
this.encounterTier = !isNullOrUndefined(this.encounterTier) ? this.encounterTier : MysteryEncounterTier.COMMON; this.encounterTier = this.encounterTier ?? MysteryEncounterTier.COMMON;
this.dialogue = this.dialogue ?? {}; this.dialogue = this.dialogue ?? {};
// Default max is 1 for ROGUE encounters, 3 for others // Default max is 1 for ROGUE encounters, 3 for others
this.maxAllowedEncounters = this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE ? 1 : 3; this.maxAllowedEncounters = this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE ? 1 : 3;
this.encounterMode = MysteryEncounterMode.DEFAULT; this.encounterMode = MysteryEncounterMode.DEFAULT;
this.requirements = this.requirements ? this.requirements : []; this.requirements = this.requirements ? this.requirements : [];
this.hideBattleIntroMessage = !isNullOrUndefined(this.hideBattleIntroMessage) ? this.hideBattleIntroMessage : false; this.hideBattleIntroMessage = this.hideBattleIntroMessage ?? false;
this.autoHideIntroVisuals = !isNullOrUndefined(this.autoHideIntroVisuals) ? this.autoHideIntroVisuals : true; this.autoHideIntroVisuals = this.autoHideIntroVisuals ?? true;
this.enterIntroVisualsFromRight = this.enterIntroVisualsFromRight ?? false;
// Reset any dirty flags or encounter data // Reset any dirty flags or encounter data
this.startOfBattleEffectsComplete = false; this.startOfBattleEffectsComplete = false;
@ -414,6 +416,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
hideBattleIntroMessage?: boolean; hideBattleIntroMessage?: boolean;
hideIntroVisuals?: boolean; hideIntroVisuals?: boolean;
enterIntroVisualsFromRight?: boolean;
enemyPartyConfigs?: EnemyPartyConfig[] = []; enemyPartyConfigs?: EnemyPartyConfig[] = [];
/** /**
@ -717,6 +720,15 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
return Object.assign(this, { autoHideIntroVisuals: autoHideIntroVisuals }); return Object.assign(this, { autoHideIntroVisuals: autoHideIntroVisuals });
} }
/**
* @param enterIntroVisualsFromRight - If true, will slide in intro visuals from the right side of the screen. If false, slides in from left, as normal
* Default false
* @returns
*/
withEnterIntroVisualsFromRight(enterIntroVisualsFromRight: boolean): this & Required<Pick<IMysteryEncounter, "enterIntroVisualsFromRight">> {
return Object.assign(this, { enterIntroVisualsFromRight: enterIntroVisualsFromRight });
}
/** /**
* Add a title for the encounter * Add a title for the encounter
* *

15
src/data/mystery-encounters/mystery-encounters.ts
View File

@ -14,10 +14,11 @@ import IMysteryEncounter from "./mystery-encounter";
import { SafariZoneEncounter } from "#app/data/mystery-encounters/encounters/safari-zone-encounter"; import { SafariZoneEncounter } from "#app/data/mystery-encounters/encounters/safari-zone-encounter";
import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter"; import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter";
import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter"; import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter";
import { PokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/pokemon-salesman-encounter"; import { ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
import { OfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/offer-you-cant-refuse-encounter"; import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter"; import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter";
import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter"; import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter";
import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter";
// Spawn chance: (BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT + WIGHT_INCREMENT_ON_SPAWN_MISS * <number of missed spawns>) / 256 // Spawn chance: (BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT + WIGHT_INCREMENT_ON_SPAWN_MISS * <number of missed spawns>) / 256
export const BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT = 1; export const BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT = 1;
@ -137,8 +138,8 @@ const nonExtremeBiomeEncounters: MysteryEncounterType[] = [
const humanTransitableBiomeEncounters: MysteryEncounterType[] = [ const humanTransitableBiomeEncounters: MysteryEncounterType[] = [
MysteryEncounterType.MYSTERIOUS_CHALLENGERS, MysteryEncounterType.MYSTERIOUS_CHALLENGERS,
MysteryEncounterType.SHADY_VITAMIN_DEALER, MysteryEncounterType.SHADY_VITAMIN_DEALER,
MysteryEncounterType.POKEMON_SALESMAN, MysteryEncounterType.THE_POKEMON_SALESMAN,
MysteryEncounterType.OFFER_YOU_CANT_REFUSE MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE
]; ];
const civilizationBiomeEncounters: MysteryEncounterType[] = [ const civilizationBiomeEncounters: MysteryEncounterType[] = [
@ -154,6 +155,7 @@ const anyBiomeEncounters: MysteryEncounterType[] = [
MysteryEncounterType.MYSTERIOUS_CHEST, MysteryEncounterType.MYSTERIOUS_CHEST,
MysteryEncounterType.TRAINING_SESSION, MysteryEncounterType.TRAINING_SESSION,
MysteryEncounterType.DELIBIRDY, MysteryEncounterType.DELIBIRDY,
MysteryEncounterType.A_TRAINERS_TEST
]; ];
/** /**
@ -236,10 +238,11 @@ export function initMysteryEncounters() {
allMysteryEncounters[MysteryEncounterType.LOST_AT_SEA] = LostAtSeaEncounter; allMysteryEncounters[MysteryEncounterType.LOST_AT_SEA] = LostAtSeaEncounter;
allMysteryEncounters[MysteryEncounterType.FIERY_FALLOUT] = FieryFalloutEncounter; allMysteryEncounters[MysteryEncounterType.FIERY_FALLOUT] = FieryFalloutEncounter;
allMysteryEncounters[MysteryEncounterType.THE_STRONG_STUFF] = TheStrongStuffEncounter; allMysteryEncounters[MysteryEncounterType.THE_STRONG_STUFF] = TheStrongStuffEncounter;
allMysteryEncounters[MysteryEncounterType.POKEMON_SALESMAN] = PokemonSalesmanEncounter; allMysteryEncounters[MysteryEncounterType.THE_POKEMON_SALESMAN] = ThePokemonSalesmanEncounter;
allMysteryEncounters[MysteryEncounterType.OFFER_YOU_CANT_REFUSE] = OfferYouCantRefuseEncounter; allMysteryEncounters[MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE] = AnOfferYouCantRefuseEncounter;
allMysteryEncounters[MysteryEncounterType.DELIBIRDY] = DelibirdyEncounter; allMysteryEncounters[MysteryEncounterType.DELIBIRDY] = DelibirdyEncounter;
allMysteryEncounters[MysteryEncounterType.ABSOLUTE_AVARICE] = AbsoluteAvariceEncounter; allMysteryEncounters[MysteryEncounterType.ABSOLUTE_AVARICE] = AbsoluteAvariceEncounter;
allMysteryEncounters[MysteryEncounterType.A_TRAINERS_TEST] = ATrainersTestEncounter;
// Add extreme encounters to biome map // Add extreme encounters to biome map
extremeBiomeEncounters.forEach(encounter => { extremeBiomeEncounters.forEach(encounter => {

23
src/data/mystery-encounters/utils/encounter-phase-utils.ts
View File

@ -5,8 +5,8 @@ import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mys
import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
import Pokemon, { FieldPosition, PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import Pokemon, { FieldPosition, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { ExpBalanceModifier, ExpShareModifier, MultipleParticipantExpBonusModifier, PokemonExpBoosterModifier } from "#app/modifier/modifier"; import { ExpBalanceModifier, ExpShareModifier, MultipleParticipantExpBonusModifier, PokemonExpBoosterModifier } from "#app/modifier/modifier";
import { CustomModifierSettings, ModifierPoolType, ModifierType, ModifierTypeFunc, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, PokemonHeldItemModifierType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import { CustomModifierSettings, ModifierPoolType, ModifierType, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, PokemonHeldItemModifierType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
import { BattleEndPhase, EggLapsePhase, ExpPhase, GameOverPhase, ModifierRewardPhase, MovePhase, SelectModifierPhase, ShowPartyExpBarPhase, TrainerVictoryPhase } from "#app/phases"; import { BattleEndPhase, EggLapsePhase, ExpPhase, GameOverPhase, MovePhase, SelectModifierPhase, ShowPartyExpBarPhase, TrainerVictoryPhase } from "#app/phases";
import { MysteryEncounterBattlePhase, MysteryEncounterBattleStartCleanupPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; import { MysteryEncounterBattlePhase, MysteryEncounterBattleStartCleanupPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
import PokemonData from "#app/system/pokemon-data"; import PokemonData from "#app/system/pokemon-data";
import { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
@ -29,6 +29,7 @@ import { Status, StatusEffect } from "#app/data/status-effect";
import { TrainerConfig, trainerConfigs, TrainerSlot } from "#app/data/trainer-config"; import { TrainerConfig, trainerConfigs, TrainerSlot } from "#app/data/trainer-config";
import PokemonSpecies from "#app/data/pokemon-species"; import PokemonSpecies from "#app/data/pokemon-species";
import Overrides from "#app/overrides"; import Overrides from "#app/overrides";
import { Egg, IEggOptions } from "#app/data/egg";
/** /**
* Animates exclamation sprite over trainer's head at start of encounter * Animates exclamation sprite over trainer's head at start of encounter
@ -305,7 +306,7 @@ export async function initBattleWithEnemyConfig(scene: BattleScene, partyConfig:
* @param scene * @param scene
* @param moves * @param moves
*/ */
export function initCustomMovesForEncounter(scene: BattleScene, moves: Moves | Moves[]) { export function loadCustomMovesForEncounter(scene: BattleScene, moves: Moves | Moves[]) {
moves = Array.isArray(moves) ? moves : [moves]; moves = Array.isArray(moves) ? moves : [moves];
return Promise.all(moves.map(move => initMoveAnim(scene, move))) return Promise.all(moves.map(move => initMoveAnim(scene, move)))
.then(() => loadMoveAnimAssets(scene, moves)); .then(() => loadMoveAnimAssets(scene, moves));
@ -436,10 +437,10 @@ export function selectPokemonForOption(scene: BattleScene, onPokemonSelected: (p
* Can have shop displayed or skipped * Can have shop displayed or skipped
* @param scene - Battle Scene * @param scene - Battle Scene
* @param customShopRewards - adds a shop phase with the specified rewards / reward tiers * @param customShopRewards - adds a shop phase with the specified rewards / reward tiers
* @param nonShopPlayerItemRewards - will add a non-shop reward phase for each specified item/modifier (can happen in addition to a shop) * @param eggRewards
* @param preRewardsCallback - can execute an arbitrary callback before the new phases if necessary (useful for updating items/party/injecting new phases before MysteryEncounterRewardsPhase) * @param preRewardsCallback - can execute an arbitrary callback before the new phases if necessary (useful for updating items/party/injecting new phases before MysteryEncounterRewardsPhase)
*/ */
export function setEncounterRewards(scene: BattleScene, customShopRewards?: CustomModifierSettings, nonShopPlayerItemRewards?: ModifierTypeFunc[], preRewardsCallback?: Function) { export function setEncounterRewards(scene: BattleScene, customShopRewards?: CustomModifierSettings, eggRewards?: IEggOptions[], preRewardsCallback?: Function) {
scene.currentBattle.mysteryEncounter.doEncounterRewards = (scene: BattleScene) => { scene.currentBattle.mysteryEncounter.doEncounterRewards = (scene: BattleScene) => {
if (preRewardsCallback) { if (preRewardsCallback) {
preRewardsCallback(); preRewardsCallback();
@ -451,14 +452,12 @@ export function setEncounterRewards(scene: BattleScene, customShopRewards?: Cust
scene.tryRemovePhase(p => p instanceof SelectModifierPhase); scene.tryRemovePhase(p => p instanceof SelectModifierPhase);
} }
if (nonShopPlayerItemRewards?.length > 0) { if (eggRewards) {
nonShopPlayerItemRewards.forEach((reward) => { eggRewards.forEach(eggOptions => {
scene.unshiftPhase(new ModifierRewardPhase(scene, reward)); const egg = new Egg(eggOptions);
egg.addEggToGameData(scene);
// queueEncounterMessage(scene, `You gained a ${egg.getEggTypeDescriptor(scene)} Egg!`);
}); });
} else {
while (!isNullOrUndefined(scene.findPhase(p => p instanceof ModifierRewardPhase))) {
scene.tryRemovePhase(p => p instanceof ModifierRewardPhase);
}
} }
return true; return true;

16
src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
View File

@ -3,7 +3,7 @@ import i18next from "i18next";
import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { isNullOrUndefined, randSeedInt } from "#app/utils";
import { PokemonHeldItemModifier } from "#app/modifier/modifier"; import { PokemonHeldItemModifier } from "#app/modifier/modifier";
import { VictoryPhase } from "#app/phases"; import { VictoryPhase } from "#app/phases";
import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import Pokemon, { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "#app/data/pokeball"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "#app/data/pokeball";
import { PlayerGender } from "#enums/player-gender"; import { PlayerGender } from "#enums/player-gender";
import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims";
@ -18,11 +18,25 @@ import PokemonSpecies, { getPokemonSpecies, speciesStarters } from "#app/data/po
import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
import { getPokemonNameWithAffix } from "#app/messages"; import { getPokemonNameWithAffix } from "#app/messages";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { Gender } from "#app/data/gender";
export interface MysteryEncounterPokemonData { export interface MysteryEncounterPokemonData {
spriteScale?: number spriteScale?: number
} }
export function getSpriteKeysFromSpecies(species: Species, female?: boolean, formIndex?: integer, shiny?: boolean, variant?: integer): { spriteKey: string, fileRoot: string } {
const spriteKey = getPokemonSpecies(species).getSpriteKey(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0);
const fileRoot = getPokemonSpecies(species).getSpriteAtlasPath(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0);
return { spriteKey, fileRoot };
}
export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string, fileRoot: string } {
const spriteKey = pokemon.getSpeciesForm().getSpriteKey(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant);
const fileRoot = pokemon.getSpeciesForm().getSpriteAtlasPath(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant);
return { spriteKey, fileRoot };
}
/** /**
* *
* Will never remove the player's last non-fainted Pokemon (if they only have 1) * Will never remove the player's last non-fainted Pokemon (if they only have 1)

195
src/data/trainer-config.ts
View File

@ -1,16 +1,16 @@
import BattleScene, {startingWave} from "../battle-scene"; import BattleScene, { startingWave } from "../battle-scene";
import {ModifierTypeFunc, modifierTypes} from "../modifier/modifier-type"; import { ModifierTypeFunc, modifierTypes } from "../modifier/modifier-type";
import {EnemyPokemon} from "../field/pokemon"; import { EnemyPokemon } from "../field/pokemon";
import * as Utils from "../utils"; import * as Utils from "../utils";
import {PokeballType} from "./pokeball"; import { PokeballType } from "./pokeball";
import {pokemonEvolutions, pokemonPrevolutions} from "./pokemon-evolutions"; import { pokemonEvolutions, pokemonPrevolutions } from "./pokemon-evolutions";
import PokemonSpecies, {getPokemonSpecies, PokemonSpeciesFilter} from "./pokemon-species"; import PokemonSpecies, { getPokemonSpecies, PokemonSpeciesFilter } from "./pokemon-species";
import {tmSpecies} from "./tms"; import { tmSpecies } from "./tms";
import {Type} from "./type"; import { Type } from "./type";
import {doubleBattleDialogue} from "./dialogue"; import { doubleBattleDialogue } from "./dialogue";
import {PersistentModifier} from "../modifier/modifier"; import { PersistentModifier } from "../modifier/modifier";
import {TrainerVariant} from "../field/trainer"; import { TrainerVariant } from "../field/trainer";
import {getIsInitialized, initI18n} from "#app/plugins/i18n"; import { getIsInitialized, initI18n } from "#app/plugins/i18n";
import i18next from "i18next"; import i18next from "i18next";
import { Moves } from "#enums/moves"; import { Moves } from "#enums/moves";
import { PartyMemberStrength } from "#enums/party-member-strength"; import { PartyMemberStrength } from "#enums/party-member-strength";
@ -527,6 +527,44 @@ export class TrainerConfig {
return this; return this;
} }
/**
* Initializes the trainer configuration for a Stat Trainer, as part of the Trainer's Test Mystery Encounter.
* @param {Species | Species[]} signatureSpecies - The signature species for the Elite Four member.
* @param {Type[]} specialtyTypes - The specialty types for the Stat Trainer.
* @param isMale - Whether the Elite Four Member is Male or Female (for localization of the title).
* @returns {TrainerConfig} - The updated TrainerConfig instance.
**/
initForStatTrainer(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig {
if (!getIsInitialized()) {
initI18n();
}
this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR);
signatureSpecies.forEach((speciesPool, s) => {
if (!Array.isArray(speciesPool)) {
speciesPool = [speciesPool];
}
this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool));
});
if (specialtyTypes.length) {
this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined);
this.setSpecialtyTypes(...specialtyTypes);
}
const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
this.name = i18next.t(`trainerNames:${nameForCall}`);
// this.setTitle(title);
this.setMoneyMultiplier(2);
this.setBoss();
this.setStaticParty();
// TODO: replace with more suitable music?
this.setBattleBgm("battle_trainer");
this.setVictoryBgm("victory_trainer");
return this;
}
/** /**
* Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though. * Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though.
* @param {Species | Species[]} signatureSpecies - The signature species for the evil team leader. * @param {Species | Species[]} signatureSpecies - The signature species for the evil team leader.
@ -1787,4 +1825,137 @@ export const trainerConfigs: TrainerConfigs = {
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL; p.pokeball = PokeballType.MASTER_BALL;
})), })),
// TODO: use signature species?
[TrainerType.BUCK]: new TrainerConfig(++t).setName("Buck").initForStatTrainer([], true)
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLAYDOL ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 3);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.COALOSSAL ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.GREAT_BALL;
if (p.species.speciesId === Species.VENUSAUR) {
p.formIndex = 2; // Gmax
p.abilityIndex = 2; // Venusaur gets Chlorophyll
} else {
p.formIndex = 1; // Gmax
}
p.generateName();
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AGGRON ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.formIndex = 1; // Mega
p.generateName();
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TORKOAL ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.abilityIndex = 1; // Drought
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GREAT_TUSK ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HEATRAN ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.CHERYL]: new TrainerConfig(++t).setName("Cheryl").initForStatTrainer([], false)
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BLISSEY ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 3);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SNORLAX, Species.LAPRAS ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.GREAT_BALL;
p.formIndex = 1; // Gmax
p.generateName();
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AUDINO ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.formIndex = 1; // Mega
p.generateName();
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOODRA ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_HANDS ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CRESSELIA, Species.ENAMORUS ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
if (p.species.speciesId === Species.ENAMORUS) {
p.formIndex = 1; // Therian
p.generateName();
}
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.MARLEY]: new TrainerConfig(++t).setName("Marley").initForStatTrainer([], false)
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCANINE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 3);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.CINDERACE, Species.INTELEON ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.GREAT_BALL;
p.formIndex = 1; // Gmax
p.generateName();
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AERODACTYL ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.formIndex = 1; // Mega
p.generateName();
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGAPULT ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_BUNDLE ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIELEKI ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.MIRA]: new TrainerConfig(++t).setName("Mira").initForStatTrainer([], false)
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALAKAZAM ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.formIndex = 1;
p.pokeball = PokeballType.ULTRA_BALL;
p.generateName();
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.GENGAR, Species.HATTERENE ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.GREAT_BALL;
p.formIndex = p.species.speciesId === Species.GENGAR ? 2 : 1; // Gmax
p.generateName();
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.FLUTTER_MANE ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.HYDREIGON ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.MAGNEZONE ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.LATIOS, Species.LATIAS ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.RILEY]: new TrainerConfig(++t).setName("Riley").initForStatTrainer([], true)
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUCARIO ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.formIndex = 1;
p.pokeball = PokeballType.ULTRA_BALL;
p.generateName();
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.RILLABOOM, Species.CENTISKORCH ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.GREAT_BALL;
p.formIndex = 1; // Gmax
p.generateName();
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TYRANITAR ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.ROARING_MOON ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.URSALUNA ], TrainerSlot.TRAINER, true))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIGIGAS, Species.LANDORUS ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
if (p.species.speciesId === Species.LANDORUS) {
p.formIndex = 1; // Therian
p.generateName();
}
p.pokeball = PokeballType.MASTER_BALL;
})),
}; };

7
src/enums/mystery-encounter-type.ts
View File

@ -12,8 +12,9 @@ export enum MysteryEncounterType {
LOST_AT_SEA, //might be generalized later on LOST_AT_SEA, //might be generalized later on
FIERY_FALLOUT, FIERY_FALLOUT,
THE_STRONG_STUFF, THE_STRONG_STUFF,
POKEMON_SALESMAN, THE_POKEMON_SALESMAN,
OFFER_YOU_CANT_REFUSE, AN_OFFER_YOU_CANT_REFUSE,
DELIBIRDY, DELIBIRDY,
ABSOLUTE_AVARICE ABSOLUTE_AVARICE,
A_TRAINERS_TEST
} }

5
src/enums/trainer-type.ts
View File

@ -70,6 +70,11 @@ export enum TrainerType {
GHETSIS_2, GHETSIS_2,
LYSANDRE, LYSANDRE,
LYSANDRE_2, LYSANDRE_2,
BUCK,
CHERYL,
MARLEY,
MIRA,
RILEY,
BROCK = 200, BROCK = 200,
MISTY, MISTY,

25
src/field/mystery-encounter-intro.ts
View File

@ -1,10 +1,11 @@
import { GameObjects } from "phaser"; import { GameObjects } from "phaser";
import BattleScene from "../battle-scene"; import BattleScene from "../battle-scene";
import IMysteryEncounter from "../data/mystery-encounters/mystery-encounter"; import IMysteryEncounter from "../data/mystery-encounters/mystery-encounter";
import { Species } from "#enums/species";
import { isNullOrUndefined } from "#app/utils";
import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
type KnownFileRoot = type KnownFileRoot =
| "trainer"
| "pokemon"
| "arenas" | "arenas"
| "battle_anims" | "battle_anims"
| "cg" | "cg"
@ -33,6 +34,8 @@ export class MysteryEncounterSpriteConfig {
spriteKey: string; spriteKey: string;
/** Refer to [/public/images](../../public/images) directorty for all folder names */ /** Refer to [/public/images](../../public/images) directorty for all folder names */
fileRoot: KnownFileRoot & string | string; fileRoot: KnownFileRoot & string | string;
/** Optional replacement for `spriteKey`/`fileRoot`. Just know this defaults to male/genderless, form 0, no shiny */
species?: Species;
/** Enable shadow. Defaults to `false` */ /** Enable shadow. Defaults to `false` */
hasShadow?: boolean = false; hasShadow?: boolean = false;
/** Disable animation. Defaults to `false` */ /** Disable animation. Defaults to `false` */
@ -69,15 +72,26 @@ export class MysteryEncounterSpriteConfig {
export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Container { export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Container {
public encounter: IMysteryEncounter; public encounter: IMysteryEncounter;
public spriteConfigs: MysteryEncounterSpriteConfig[]; public spriteConfigs: MysteryEncounterSpriteConfig[];
public enterFromRight: boolean;
constructor(scene: BattleScene, encounter: IMysteryEncounter) { constructor(scene: BattleScene, encounter: IMysteryEncounter) {
super(scene, -72, 76); super(scene, -72, 76);
this.encounter = encounter; this.encounter = encounter;
this.enterFromRight = encounter.enterIntroVisualsFromRight ?? false;
// Shallow copy configs to allow visual config updates at runtime without dirtying master copy of Encounter // Shallow copy configs to allow visual config updates at runtime without dirtying master copy of Encounter
this.spriteConfigs = encounter.spriteConfigs.map(config => { this.spriteConfigs = encounter.spriteConfigs.map(config => {
return { const result = {
...config ...config
}; };
if (!isNullOrUndefined(result.species)) {
const keys = getSpriteKeysFromSpecies(result.species);
result.spriteKey = keys.spriteKey;
result.fileRoot = keys.fileRoot;
result.isPokemon = true;
}
return result;
}); });
if (!this.spriteConfigs) { if (!this.spriteConfigs) {
return; return;
@ -90,9 +104,10 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
return ret; return ret;
}; };
const getItemSprite = (spriteKey: string) => { const getItemSprite = (spriteKey: string, hasShadow?: boolean, yShadow?: number) => {
const icon = this.scene.add.sprite(-19, 2, "items", spriteKey); const icon = this.scene.add.sprite(-19, 2, "items", spriteKey);
icon.setOrigin(0.5, 1); icon.setOrigin(0.5, 1);
icon.setPipeline(this.scene.spritePipeline, { tone: [0.0, 0.0, 0.0, 0.0], hasShadow: !!hasShadow, yShadowOffset: yShadow ?? 0 });
return icon; return icon;
}; };
@ -114,7 +129,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con
sprite = getSprite(spriteKey, hasShadow, yShadow); sprite = getSprite(spriteKey, hasShadow, yShadow);
tintSprite = getSprite(spriteKey); tintSprite = getSprite(spriteKey);
} else { } else {
sprite = getItemSprite(spriteKey); sprite = getItemSprite(spriteKey, hasShadow, yShadow);
tintSprite = getItemSprite(spriteKey); tintSprite = getItemSprite(spriteKey);
} }

2
src/field/pokemon.ts
View File

@ -1728,7 +1728,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
hideInfo(): Promise<void> { hideInfo(): Promise<void> {
return new Promise(resolve => { return new Promise(resolve => {
if (this.battleInfo.visible) { if (this.battleInfo && this.battleInfo.visible) {
this.scene.tweens.add({ this.scene.tweens.add({
targets: [ this.battleInfo, this.battleInfo.expMaskRect ], targets: [ this.battleInfo, this.battleInfo.expMaskRect ],
x: this.isPlayer() ? "+=150" : `-=${!this.isBoss() ? 150 : 246}`, x: this.isPlayer() ? "+=150" : `-=${!this.isBoss() ? 150 : 246}`,

61
src/locales/en/dialogue.ts
View File

@ -566,6 +566,67 @@ export const PGMdialogue: DialogueTranslationEntries = {
1: "Fools with no vision will continue to befoul this beautiful world." 1: "Fools with no vision will continue to befoul this beautiful world."
} }
}, },
"stat_trainer_buck": {
"encounter": {
1: "...I'm telling you right now. I'm seriously tough. Act surprised!",
2: "I can feel my Pokémon shivering inside their Pokéballs!"
},
"victory": {
1: "Heeheehee!\nSo hot, you!"
},
"defeat": {
1: "Whoa! You're all out of gas, I guess."
}
},
"stat_trainer_cheryl": {
"encounter": {
1: "My Pokémon have been itching for a battle.",
2: "I should warn you, my Pokémon can be quite rambunctious."
},
"victory": {
1: "Striking the right balance of offense and defense... It's not easy to do."
},
"defeat": {
1: "Do your Pokémon need any healing?"
}
},
"stat_trainer_marley": {
"encounter": {
1: "... OK.\nI'll do my best.",
2: "... OK.\nI... won't lose...!"
},
"victory": {
1: "... Awww."
},
"defeat": {
1: "... Goodbye."
}
},
"stat_trainer_mira": {
"encounter": {
1: "You will be shocked by Mira!",
2: "Mira will show you that Mira doesn't get lost anymore!"
},
"victory": {
1: "Mira wonders if she can get very far in this land."
},
"defeat": {
1: "Mira knew she would win!"
}
},
"stat_trainer_riley": {
"encounter": {
1: "Battling is our way of greeting!",
2: "We're pulling out all the stops to put your Pokémon down.",
},
"victory": {
1: `At times we battle, and sometimes we team up...
$It's great how Trainers can interact.`
},
"defeat": {
1: "You put up quite the display.\nBetter luck next time."
}
},
"brock": { "brock": {
"encounter": { "encounter": {
1: "My expertise on Rock-type Pokémon will take you down! Come on!", 1: "My expertise on Rock-type Pokémon will take you down! Come on!",

1
src/locales/en/egg.ts
View File

@ -13,6 +13,7 @@ export const egg: SimpleTranslationEntries = {
"gachaTypeLegendary": "Legendary Rate Up", "gachaTypeLegendary": "Legendary Rate Up",
"gachaTypeMove": "Rare Egg Move Rate Up", "gachaTypeMove": "Rare Egg Move Rate Up",
"gachaTypeShiny": "Shiny Rate Up", "gachaTypeShiny": "Shiny Rate Up",
"eventType": "Mystery Event",
"selectMachine": "Select a machine.", "selectMachine": "Select a machine.",
"notEnoughVouchers": "You don't have enough vouchers!", "notEnoughVouchers": "You don't have enough vouchers!",
"tooManyEggs": "You have too many eggs!", "tooManyEggs": "You have too many eggs!",

10
src/locales/en/mystery-encounter.ts
View File

@ -11,10 +11,11 @@ import { shadyVitaminDealerDialogue } from "#app/locales/en/mystery-encounters/s
import { slumberingSnorlaxDialogue } from "#app/locales/en/mystery-encounters/slumbering-snorlax-dialogue"; import { slumberingSnorlaxDialogue } from "#app/locales/en/mystery-encounters/slumbering-snorlax-dialogue";
import { trainingSessionDialogue } from "#app/locales/en/mystery-encounters/training-session-dialogue"; import { trainingSessionDialogue } from "#app/locales/en/mystery-encounters/training-session-dialogue";
import { theStrongStuffDialogue } from "#app/locales/en/mystery-encounters/the-strong-stuff-dialogue"; import { theStrongStuffDialogue } from "#app/locales/en/mystery-encounters/the-strong-stuff-dialogue";
import { pokemonSalesmanDialogue } from "#app/locales/en/mystery-encounters/pokemon-salesman-dialogue"; import { thePokemonSalesmanDialogue } from "#app/locales/en/mystery-encounters/the-pokemon-salesman-dialogue";
import { offerYouCantRefuseDialogue } from "#app/locales/en/mystery-encounters/offer-you-cant-refuse-dialogue"; import { anOfferYouCantRefuseDialogue } from "#app/locales/en/mystery-encounters/an-offer-you-cant-refuse-dialogue";
import { delibirdyDialogue } from "#app/locales/en/mystery-encounters/delibirdy-dialogue"; import { delibirdyDialogue } from "#app/locales/en/mystery-encounters/delibirdy-dialogue";
import { absoluteAvariceDialogue } from "#app/locales/en/mystery-encounters/absolute-avarice-dialogue"; import { absoluteAvariceDialogue } from "#app/locales/en/mystery-encounters/absolute-avarice-dialogue";
import { aTrainersTestDialogue } from "#app/locales/en/mystery-encounters/a-trainers-test-dialogue";
/** /**
* Patterns that can be used: * Patterns that can be used:
@ -51,8 +52,9 @@ export const mysteryEncounter = {
lostAtSea: lostAtSeaDialogue, lostAtSea: lostAtSeaDialogue,
fieryFallout: fieryFalloutDialogue, fieryFallout: fieryFalloutDialogue,
theStrongStuff: theStrongStuffDialogue, theStrongStuff: theStrongStuffDialogue,
pokemonSalesman: pokemonSalesmanDialogue, pokemonSalesman: thePokemonSalesmanDialogue,
offerYouCantRefuse: offerYouCantRefuseDialogue, offerYouCantRefuse: anOfferYouCantRefuseDialogue,
delibirdy: delibirdyDialogue, delibirdy: delibirdyDialogue,
absoluteAvarice: absoluteAvariceDialogue, absoluteAvarice: absoluteAvariceDialogue,
aTrainersTest: aTrainersTestDialogue,
} as const; } as const;

67
src/locales/en/mystery-encounters/a-trainers-test-dialogue.ts Normal file
View File

@ -0,0 +1,67 @@
export const aTrainersTestDialogue = {
intro: "An extremely strong trainer approaches you...",
buck: {
intro_dialogue: `Yo, trainer! My name's Buck.
$I have a super awesome proposal\nfor a strong trainer such as yourself!
$I'm carrying two rare Pokémon Eggs with me,\nbut I'd like someone else to care for one.
$If you can prove your strength as a trainer to me,\nI'll give you the rarer egg!`,
accept: "Whoooo, I'm getting fired up!",
decline: `Darn, it looks like your\nteam isn't in peak condition.
$Here, let me help with that.`
},
cheryl: {
intro_dialogue: `Hello, my name's Cheryl.
$I have a particularly interesting request,\nfor a strong trainer such as yourself.
$I'm carrying two rare Pokémon Eggs with me,\nbut I'd like someone else to care for one.
$If you can prove your strength as a trainer to me,\nI'll give you the rarer Egg!`,
accept: "I hope you're ready!",
decline: `I understand, it looks like your team\nisn't in the best condition at the moment.
$Here, let me help with that.`
},
marley: {
intro_dialogue: `...@d{64} I'm Marley.
$I have an offer for you...
$I'm carrying two Pokémon Eggs with me,\nbut I'd like someone else to care for one.
$If you're stronger than me,\nI'll give you the rarer Egg.`,
accept: "... I see.",
decline: `... I see.
$Your Pokémon look hurt...\nLet me help.`
},
mira: {
intro_dialogue: `Hi! I'm Mira!
$Mira has a request\nfor a strong trainer like you!
$Mira has two rare Pokémon Eggs,\nbut Mira wants someone else to take one!
$If you show Mira that you're strong,\nMira will give you the rarer Egg!`,
accept: "You'll battle Mira?\nYay!",
decline: `Aww, no battle?\nThat's okay!
$Here, Mira will heal your team!`
},
riley: {
intro_dialogue: `I'm Riley.
$I have an odd proposal\nfor a strong trainer such as yourself.
$I'm carrying two rare Pokémon Eggs with me,\nbut I'd like to give one to another trainer.
$If you can prove your strength to me,\nI'll give you the rarer Egg!`,
accept: "That look you have...\nLet's do this.",
decline: `I understand, your team looks beat up.
$Here, let me help with that.`
},
title: "A Trainer's Test",
description: "It seems this trainer is willing to give you an Egg regardless of your decision. However, if you can manage to defeat this strong trainer, you'll receive a much rarer Egg.",
query: "What will you do?",
option: {
1: {
label: "Accept the Challenge",
tooltip: "(-) Tough Battle\n(+) Gain a @[TOOLTIP_TITLE]{Very Rare Egg}"
},
2: {
label: "Refuse the Challenge",
tooltip: "(+) Full Heal Party\n(+) Gain an @[TOOLTIP_TITLE]{Egg}",
},
},
eggTypes: {
rare: "a Rare Egg",
epic: "an Epic Egg",
legendary: "a Legendary Egg"
},
outro: "{{statTrainerName}} gave you {{eggType}}!"
};

2
src/locales/en/mystery-encounters/offer-you-cant-refuse-dialogue.ts → src/locales/en/mystery-encounters/an-offer-you-cant-refuse-dialogue.ts
View File

@ -1,4 +1,4 @@
export const offerYouCantRefuseDialogue = { export const anOfferYouCantRefuseDialogue = {
intro: "You're stopped by a rich looking boy.", intro: "You're stopped by a rich looking boy.",
speaker: "Rich Boy", speaker: "Rich Boy",
intro_dialogue: `Good day to you. intro_dialogue: `Good day to you.

2
src/locales/en/mystery-encounters/pokemon-salesman-dialogue.ts → src/locales/en/mystery-encounters/the-pokemon-salesman-dialogue.ts
View File

@ -1,4 +1,4 @@
export const pokemonSalesmanDialogue = { export const thePokemonSalesmanDialogue = {
intro: "A chipper elderly man approaches you.", intro: "A chipper elderly man approaches you.",
speaker: "Gentleman", speaker: "Gentleman",
intro_dialogue: "Hello there! Have I got a deal just for YOU!", intro_dialogue: "Hello there! Have I got a deal just for YOU!",

5
src/locales/en/trainers.ts
View File

@ -270,6 +270,11 @@ export const trainerNames: SimpleTranslationEntries = {
"cyrus": "Cyrus", "cyrus": "Cyrus",
"ghetsis": "Ghetsis", "ghetsis": "Ghetsis",
"lysandre": "Lysandre", "lysandre": "Lysandre",
"buck": "Buck",
"cheryl": "Cheryl",
"marley": "Marley",
"mira": "Mira",
"riley": "Riley",
// Double Names // Double Names
"blue_red_double": "Blue & Red", "blue_red_double": "Blue & Red",

29
src/phases.ts
View File

@ -1002,8 +1002,8 @@ export class EncounterPhase extends BattlePhase {
const enemyField = this.scene.getEnemyField(); const enemyField = this.scene.getEnemyField();
this.scene.tweens.add({ this.scene.tweens.add({
targets: [this.scene.arenaEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.currentBattle?.mysteryEncounter?.introVisuals, this.scene.arenaPlayer, this.scene.trainer].flat(), targets: [this.scene.arenaEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.arenaPlayer, this.scene.trainer].flat(),
x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 3 + (enemyField.length) ? value + 300 : value - 300, x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 2 + (enemyField.length) ? value + 300 : value - 300,
duration: 2000, duration: 2000,
onComplete: () => { onComplete: () => {
if (!this.tryOverrideForBattleSpec()) { if (!this.tryOverrideForBattleSpec()) {
@ -1011,6 +1011,19 @@ export class EncounterPhase extends BattlePhase {
} }
} }
}); });
const encounterIntroVisuals = this.scene.currentBattle?.mysteryEncounter?.introVisuals;
if (encounterIntroVisuals) {
const enterFromRight = encounterIntroVisuals.enterFromRight;
if (enterFromRight) {
encounterIntroVisuals.x += 500;
}
this.scene.tweens.add({
targets: encounterIntroVisuals,
x: enterFromRight ? "-=200" : "+=300",
duration: 2000
});
}
} }
getEncounterMessage(): string { getEncounterMessage(): string {
@ -1106,8 +1119,6 @@ export class EncounterPhase extends BattlePhase {
} }
const doEncounter = () => { const doEncounter = () => {
this.scene.playBgm(undefined);
const doShowEncounterOptions = () => { const doShowEncounterOptions = () => {
this.scene.ui.clearText(); this.scene.ui.clearText();
this.scene.ui.getMessageHandler().hideNameText(); this.scene.ui.getMessageHandler().hideNameText();
@ -1264,8 +1275,18 @@ export class NextEncounterPhase extends EncounterPhase {
} }
const nextEncounterVisuals = this.scene.currentBattle?.mysteryEncounter?.introVisuals; const nextEncounterVisuals = this.scene.currentBattle?.mysteryEncounter?.introVisuals;
if (nextEncounterVisuals) { if (nextEncounterVisuals) {
const enterFromRight = nextEncounterVisuals.enterFromRight;
if (enterFromRight) {
nextEncounterVisuals.x += 500;
this.scene.tweens.add({
targets: nextEncounterVisuals,
x: "-=200",
duration: 2000
});
} else {
moveTargets.push(nextEncounterVisuals); moveTargets.push(nextEncounterVisuals);
} }
}
this.scene.tweens.add({ this.scene.tweens.add({
targets: moveTargets.flat(), targets: moveTargets.flat(),
x: "+=300", x: "+=300",

203
src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts Normal file
View File

@ -0,0 +1,203 @@
import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
import { Biome } from "#app/enums/biome";
import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
import { Species } from "#app/enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounterTestUtils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter";
import { CommandPhase, PartyHealPhase, SelectModifierPhase } from "#app/phases";
import { EggTier } from "#enums/egg-type";
const namespace = "mysteryEncounter:aTrainersTest";
const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA];
const defaultBiome = Biome.CAVE;
const defaultWave = 45;
describe("A Trainer's Test - Mystery Encounter", () => {
let phaserGame: Phaser.Game;
let game: GameManager;
let scene: BattleScene;
beforeAll(() => {
phaserGame = new Phaser.Game({ type: Phaser.HEADLESS });
});
beforeEach(async () => {
game = new GameManager(phaserGame);
scene = game.scene;
game.override.mysteryEncounterChance(100);
game.override.mysteryEncounterTier(MysteryEncounterTier.COMMON);
game.override.startingWave(defaultWave);
game.override.startingBiome(defaultBiome);
const biomeMap = new Map<Biome, MysteryEncounterType[]>([
[Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
]);
HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
biomeMap.set(biome, [MysteryEncounterType.A_TRAINERS_TEST]);
});
vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
});
afterEach(() => {
game.phaseInterceptor.restoreOg();
vi.clearAllMocks();
vi.resetAllMocks();
});
it("should have the correct properties", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.A_TRAINERS_TEST, defaultParty);
expect(ATrainersTestEncounter.encounterType).toBe(MysteryEncounterType.A_TRAINERS_TEST);
expect(ATrainersTestEncounter.encounterTier).toBe(MysteryEncounterTier.ROGUE);
expect(ATrainersTestEncounter.dialogue).toBeDefined();
expect(ATrainersTestEncounter.dialogue.intro).toBeDefined();
expect(ATrainersTestEncounter.dialogue.intro[0].speaker).toBeDefined();
expect(ATrainersTestEncounter.dialogue.intro[0].text).toBeDefined();
expect(ATrainersTestEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(ATrainersTestEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(ATrainersTestEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(ATrainersTestEncounter.options.length).toBe(2);
});
it("should not run below wave 10", async () => {
game.override.startingWave(9);
await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.A_TRAINERS_TEST);
});
it("should not run above wave 179", async () => {
game.override.startingWave(181);
await game.runToMysteryEncounter();
expect(scene.currentBattle.mysteryEncounter).toBeUndefined();
});
it("should initialize fully ", async () => {
initSceneWithoutEncounterPhase(scene, defaultParty);
scene.currentBattle.mysteryEncounter = ATrainersTestEncounter;
const { onInit } = ATrainersTestEncounter;
expect(ATrainersTestEncounter.onInit).toBeDefined();
ATrainersTestEncounter.populateDialogueTokensFromRequirements(scene);
const onInitResult = onInit(scene);
expect(ATrainersTestEncounter.dialogueTokens?.statTrainerName).toBeDefined();
expect(ATrainersTestEncounter.misc.trainerType).toBeDefined();
expect(ATrainersTestEncounter.misc.trainerNameKey).toBeDefined();
expect(ATrainersTestEncounter.misc.trainerEggDescription).toBeDefined();
expect(ATrainersTestEncounter.dialogue.intro).toBeDefined();
expect(ATrainersTestEncounter.options[1].dialogue.selected).toBeDefined();
expect(onInitResult).toBe(true);
});
describe("Option 1 - Accept the Challenge", () => {
it("should have the correct properties", () => {
const option = ATrainersTestEncounter.options[0];
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined();
expect(option.dialogue.buttonLabel).toStrictEqual(`${namespace}.option.1.label`);
expect(option.dialogue.buttonTooltip).toStrictEqual(`${namespace}.option.1.tooltip`);
});
it("Should start battle against the trainer", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.A_TRAINERS_TEST, defaultParty);
await runMysteryEncounterToEnd(game, 1, null, true);
const enemyField = scene.getEnemyField();
expect(scene.getCurrentPhase().constructor.name).toBe(CommandPhase.name);
expect(enemyField.length).toBe(1);
expect(scene.currentBattle.trainer).toBeDefined();
expect(["buck", "cheryl", "marley", "mira", "riley"].includes(scene.currentBattle.trainer.config.name.toLowerCase())).toBeTruthy();
expect(enemyField[0]).toBeDefined();
});
it("Should reward the player with an Epic or Legendary egg", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.A_TRAINERS_TEST, defaultParty);
const eggsBefore = scene.gameData.eggs;
expect(eggsBefore).toBeDefined();
const eggsBeforeLength = eggsBefore.length;
await runMysteryEncounterToEnd(game, 1, null, true);
await skipBattleRunMysteryEncounterRewardsPhase(game);
await game.phaseInterceptor.to(SelectModifierPhase, false);
expect(scene.getCurrentPhase().constructor.name).toBe(SelectModifierPhase.name);
const eggsAfter = scene.gameData.eggs;
expect(eggsAfter).toBeDefined();
expect(eggsBeforeLength + 1).toBe(eggsAfter.length);
const eggTier = eggsAfter[eggsAfter.length - 1].tier;
expect(eggTier === EggTier.ULTRA || eggTier === EggTier.MASTER).toBeTruthy();
});
});
describe("Option 2 - Decline the Challenge", () => {
beforeEach(() => {
// Mock sound object
vi.spyOn(scene, "playSoundWithoutBgm").mockImplementation(() => {
return {
totalDuration: 1,
destroy: () => null
} as Phaser.Sound.NoAudioSound;
});
});
it("should have the correct properties", () => {
const option = ATrainersTestEncounter.options[1];
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined();
expect(option.dialogue.buttonLabel).toStrictEqual(`${namespace}.option.2.label`);
expect(option.dialogue.buttonTooltip).toStrictEqual(`${namespace}.option.2.tooltip`);
});
it("Should fully heal the party", async () => {
const phaseSpy = vi.spyOn(scene, "unshiftPhase");
await game.runToMysteryEncounter(MysteryEncounterType.A_TRAINERS_TEST, defaultParty);
await runMysteryEncounterToEnd(game, 2);
const partyHealPhases = phaseSpy.mock.calls.filter(p => p[0] instanceof PartyHealPhase).map(p => p[0]);
expect(partyHealPhases.length).toBe(1);
});
it("Should reward the player with a Rare egg", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.A_TRAINERS_TEST, defaultParty);
const eggsBefore = scene.gameData.eggs;
expect(eggsBefore).toBeDefined();
const eggsBeforeLength = eggsBefore.length;
await runMysteryEncounterToEnd(game, 2);
await game.phaseInterceptor.to(SelectModifierPhase, false);
expect(scene.getCurrentPhase().constructor.name).toBe(SelectModifierPhase.name);
const eggsAfter = scene.gameData.eggs;
expect(eggsAfter).toBeDefined();
expect(eggsBeforeLength + 1).toBe(eggsAfter.length);
const eggTier = eggsAfter[eggsAfter.length - 1].tier;
expect(eggTier).toBe(EggTier.GREAT);
});
it("should leave encounter without battle", async () => {
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
await game.runToMysteryEncounter(MysteryEncounterType.A_TRAINERS_TEST, defaultParty);
await runMysteryEncounterToEnd(game, 2);
expect(leaveEncounterWithoutBattleSpy).toBeCalled();
});
});
});

26
src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
View File

@ -57,10 +57,10 @@ describe("Absolute Avarice - Mystery Encounter", () => {
expect(AbsoluteAvariceEncounter.encounterType).toBe(MysteryEncounterType.ABSOLUTE_AVARICE); expect(AbsoluteAvariceEncounter.encounterType).toBe(MysteryEncounterType.ABSOLUTE_AVARICE);
expect(AbsoluteAvariceEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT); expect(AbsoluteAvariceEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
expect(AbsoluteAvariceEncounter.dialogue).toBeDefined(); expect(AbsoluteAvariceEncounter.dialogue).toBeDefined();
expect(AbsoluteAvariceEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(AbsoluteAvariceEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}.intro` }]);
expect(AbsoluteAvariceEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(AbsoluteAvariceEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(AbsoluteAvariceEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(AbsoluteAvariceEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(AbsoluteAvariceEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(AbsoluteAvariceEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(AbsoluteAvariceEncounter.options.length).toBe(3); expect(AbsoluteAvariceEncounter.options.length).toBe(3);
}); });
@ -118,11 +118,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}); });
@ -171,11 +171,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}); });
@ -229,11 +229,11 @@ describe("Absolute Avarice - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}); });

90
src/test/mystery-encounter/encounters/offer-you-cant-refuse-encounter.test.ts → src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
View File

@ -9,7 +9,7 @@ import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encount
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounterTestUtils"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounterTestUtils";
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
import { PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { OfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/offer-you-cant-refuse-encounter"; import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
@ -44,7 +44,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
[Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
]); ]);
HUMAN_TRANSITABLE_BIOMES.forEach(biome => { HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
biomeMap.set(biome, [MysteryEncounterType.OFFER_YOU_CANT_REFUSE]); biomeMap.set(biome, [MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE]);
}); });
vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
}); });
@ -56,26 +56,26 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
}); });
it("should have the correct properties", async () => { it("should have the correct properties", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
expect(OfferYouCantRefuseEncounter.encounterType).toBe(MysteryEncounterType.OFFER_YOU_CANT_REFUSE); expect(AnOfferYouCantRefuseEncounter.encounterType).toBe(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE);
expect(OfferYouCantRefuseEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT); expect(AnOfferYouCantRefuseEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
expect(OfferYouCantRefuseEncounter.dialogue).toBeDefined(); expect(AnOfferYouCantRefuseEncounter.dialogue).toBeDefined();
expect(OfferYouCantRefuseEncounter.dialogue.intro).toStrictEqual([ expect(AnOfferYouCantRefuseEncounter.dialogue.intro).toStrictEqual([
{ text: `${namespace}:intro` }, { text: `${namespace}.intro` },
{ speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` } { speaker: `${namespace}.speaker`, text: `${namespace}.intro_dialogue` }
]); ]);
expect(OfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(OfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(OfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(AnOfferYouCantRefuseEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(OfferYouCantRefuseEncounter.options.length).toBe(3); expect(AnOfferYouCantRefuseEncounter.options.length).toBe(3);
}); });
it("should not spawn outside of HUMAN_TRANSITABLE_BIOMES", async () => { it("should not spawn outside of HUMAN_TRANSITABLE_BIOMES", async () => {
game.override.startingBiome(Biome.VOLCANO); game.override.startingBiome(Biome.VOLCANO);
await game.runToMysteryEncounter(); await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.OFFER_YOU_CANT_REFUSE); expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE);
}); });
it("should not run below wave 10", async () => { it("should not run below wave 10", async () => {
@ -83,7 +83,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
await game.runToMysteryEncounter(); await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.OFFER_YOU_CANT_REFUSE); expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE);
}); });
it("should not run above wave 179", async () => { it("should not run above wave 179", async () => {
@ -96,36 +96,36 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
it("should initialize fully ", async () => { it("should initialize fully ", async () => {
initSceneWithoutEncounterPhase(scene, defaultParty); initSceneWithoutEncounterPhase(scene, defaultParty);
scene.currentBattle.mysteryEncounter = OfferYouCantRefuseEncounter; scene.currentBattle.mysteryEncounter = AnOfferYouCantRefuseEncounter;
const { onInit } = OfferYouCantRefuseEncounter; const { onInit } = AnOfferYouCantRefuseEncounter;
expect(OfferYouCantRefuseEncounter.onInit).toBeDefined(); expect(AnOfferYouCantRefuseEncounter.onInit).toBeDefined();
OfferYouCantRefuseEncounter.populateDialogueTokensFromRequirements(scene); AnOfferYouCantRefuseEncounter.populateDialogueTokensFromRequirements(scene);
const onInitResult = onInit(scene); const onInitResult = onInit(scene);
expect(OfferYouCantRefuseEncounter.dialogueTokens?.strongestPokemon).toBeDefined(); expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.strongestPokemon).toBeDefined();
expect(OfferYouCantRefuseEncounter.dialogueTokens?.price).toBeDefined(); expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.price).toBeDefined();
expect(OfferYouCantRefuseEncounter.dialogueTokens?.option2PrimaryAbility).toBe("Intimidate"); expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.option2PrimaryAbility).toBe("Intimidate");
expect(OfferYouCantRefuseEncounter.dialogueTokens?.moveOrAbility).toBe("Intimidate"); expect(AnOfferYouCantRefuseEncounter.dialogueTokens?.moveOrAbility).toBe("Intimidate");
expect(OfferYouCantRefuseEncounter.misc.pokemon instanceof PlayerPokemon).toBeTruthy(); expect(AnOfferYouCantRefuseEncounter.misc.pokemon instanceof PlayerPokemon).toBeTruthy();
expect(OfferYouCantRefuseEncounter.misc?.price?.toString()).toBe(OfferYouCantRefuseEncounter.dialogueTokens?.price); expect(AnOfferYouCantRefuseEncounter.misc?.price?.toString()).toBe(AnOfferYouCantRefuseEncounter.dialogueTokens?.price);
expect(onInitResult).toBe(true); expect(onInitResult).toBe(true);
}); });
describe("Option 1 - Sell your Pokemon for money and a Shiny Charm", () => { describe("Option 1 - Sell your Pokemon for money and a Shiny Charm", () => {
it("should have the correct properties", () => { it("should have the correct properties", () => {
const option = OfferYouCantRefuseEncounter.options[0]; const option = AnOfferYouCantRefuseEncounter.options[0];
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}); });
@ -136,7 +136,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
scene.money = initialMoney; scene.money = initialMoney;
const updateMoneySpy = vi.spyOn(EncounterPhaseUtils, "updatePlayerMoney"); const updateMoneySpy = vi.spyOn(EncounterPhaseUtils, "updatePlayerMoney");
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
await runMysteryEncounterToEnd(game, 1); await runMysteryEncounterToEnd(game, 1);
const price = scene.currentBattle.mysteryEncounter.misc.price; const price = scene.currentBattle.mysteryEncounter.misc.price;
@ -146,7 +146,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
}); });
it("Should give the player a Shiny Charm", async () => { it("Should give the player a Shiny Charm", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
await runMysteryEncounterToEnd(game, 1); await runMysteryEncounterToEnd(game, 1);
const itemModifier = scene.findModifier(m => m instanceof ShinyRateBoosterModifier) as ShinyRateBoosterModifier; const itemModifier = scene.findModifier(m => m instanceof ShinyRateBoosterModifier) as ShinyRateBoosterModifier;
@ -156,7 +156,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
}); });
it("Should remove the Pokemon from the party", async () => { it("Should remove the Pokemon from the party", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
const initialPartySize = scene.getParty().length; const initialPartySize = scene.getParty().length;
const pokemonName = scene.currentBattle.mysteryEncounter.misc.pokemon.name; const pokemonName = scene.currentBattle.mysteryEncounter.misc.pokemon.name;
@ -170,7 +170,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
it("should leave encounter without battle", async () => { it("should leave encounter without battle", async () => {
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
await runMysteryEncounterToEnd(game, 1); await runMysteryEncounterToEnd(game, 1);
expect(leaveEncounterWithoutBattleSpy).toBeCalled(); expect(leaveEncounterWithoutBattleSpy).toBeCalled();
@ -179,24 +179,24 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
describe("Option 2 - Extort the Kid", () => { describe("Option 2 - Extort the Kid", () => {
it("should have the correct properties", () => { it("should have the correct properties", () => {
const option = OfferYouCantRefuseEncounter.options[1]; const option = AnOfferYouCantRefuseEncounter.options[1];
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
disabledButtonTooltip: `${namespace}:option:2:tooltip_disabled`, disabledButtonTooltip: `${namespace}.option.2.tooltip_disabled`,
selected: [ selected: [
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}); });
}); });
it("should award EXP to a pokemon with an ability in EXTORTION_ABILITIES", async () => { it("should award EXP to a pokemon with an ability in EXTORTION_ABILITIES", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
const party = scene.getParty(); const party = scene.getParty();
const gyarados = party.find((pkm) => pkm.species.speciesId === Species.GYARADOS); const gyarados = party.find((pkm) => pkm.species.speciesId === Species.GYARADOS);
const expBefore = gyarados.exp; const expBefore = gyarados.exp;
@ -207,7 +207,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
}); });
it("should award EXP to a pokemon with a move in EXTORTION_MOVES", async () => { it("should award EXP to a pokemon with a move in EXTORTION_MOVES", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, [Species.ABRA]); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, [Species.ABRA]);
const party = scene.getParty(); const party = scene.getParty();
const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA); const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA);
abra.moveset = [new PokemonMove(Moves.BEAT_UP)]; abra.moveset = [new PokemonMove(Moves.BEAT_UP)];
@ -223,7 +223,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
scene.money = initialMoney; scene.money = initialMoney;
const updateMoneySpy = vi.spyOn(EncounterPhaseUtils, "updatePlayerMoney"); const updateMoneySpy = vi.spyOn(EncounterPhaseUtils, "updatePlayerMoney");
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
await runMysteryEncounterToEnd(game, 2); await runMysteryEncounterToEnd(game, 2);
const price = scene.currentBattle.mysteryEncounter.misc.price; const price = scene.currentBattle.mysteryEncounter.misc.price;
@ -235,7 +235,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
it("should leave encounter without battle", async () => { it("should leave encounter without battle", async () => {
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
await runMysteryEncounterToEnd(game, 2); await runMysteryEncounterToEnd(game, 2);
expect(leaveEncounterWithoutBattleSpy).toBeCalled(); expect(leaveEncounterWithoutBattleSpy).toBeCalled();
@ -246,7 +246,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
it("should leave encounter without battle", async () => { it("should leave encounter without battle", async () => {
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
await game.runToMysteryEncounter(MysteryEncounterType.OFFER_YOU_CANT_REFUSE, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
await runMysteryEncounterToEnd(game, 3); await runMysteryEncounterToEnd(game, 3);
expect(leaveEncounterWithoutBattleSpy).toBeCalled(); expect(leaveEncounterWithoutBattleSpy).toBeCalled();

32
src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
View File

@ -58,11 +58,11 @@ describe("Delibird-y - Mystery Encounter", () => {
expect(DelibirdyEncounter.encounterType).toBe(MysteryEncounterType.DELIBIRDY); expect(DelibirdyEncounter.encounterType).toBe(MysteryEncounterType.DELIBIRDY);
expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT); expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
expect(DelibirdyEncounter.dialogue).toBeDefined(); expect(DelibirdyEncounter.dialogue).toBeDefined();
expect(DelibirdyEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(DelibirdyEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}.intro` }]);
expect(DelibirdyEncounter.dialogue.outro).toStrictEqual([{ text: `${namespace}:outro` }]); expect(DelibirdyEncounter.dialogue.outro).toStrictEqual([{ text: `${namespace}.outro` }]);
expect(DelibirdyEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(DelibirdyEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(DelibirdyEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(DelibirdyEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(DelibirdyEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(DelibirdyEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(DelibirdyEncounter.options.length).toBe(3); expect(DelibirdyEncounter.options.length).toBe(3);
}); });
@ -96,11 +96,11 @@ describe("Delibird-y - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}); });
@ -190,12 +190,12 @@ describe("Delibird-y - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
secondOptionPrompt: `${namespace}:option:2:select_prompt`, secondOptionPrompt: `${namespace}.option.2.select_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}); });
@ -352,12 +352,12 @@ describe("Delibird-y - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
secondOptionPrompt: `${namespace}:option:3:select_prompt`, secondOptionPrompt: `${namespace}.option.3.select_prompt`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}); });

28
src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
View File

@ -60,15 +60,15 @@ describe("Department Store Sale - Mystery Encounter", () => {
expect(DepartmentStoreSaleEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON); expect(DepartmentStoreSaleEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
expect(DepartmentStoreSaleEncounter.dialogue).toBeDefined(); expect(DepartmentStoreSaleEncounter.dialogue).toBeDefined();
expect(DepartmentStoreSaleEncounter.dialogue.intro).toStrictEqual([ expect(DepartmentStoreSaleEncounter.dialogue.intro).toStrictEqual([
{ text: `${namespace}:intro` }, { text: `${namespace}.intro` },
{ {
speaker: `${namespace}:speaker`, speaker: `${namespace}.speaker`,
text: `${namespace}:intro_dialogue`, text: `${namespace}.intro_dialogue`,
} }
]); ]);
expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(DepartmentStoreSaleEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(DepartmentStoreSaleEncounter.options.length).toBe(4); expect(DepartmentStoreSaleEncounter.options.length).toBe(4);
}); });
@ -101,8 +101,8 @@ describe("Department Store Sale - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
}); });
}); });
@ -136,8 +136,8 @@ describe("Department Store Sale - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
}); });
}); });
@ -172,8 +172,8 @@ describe("Department Store Sale - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
}); });
}); });
@ -208,8 +208,8 @@ describe("Department Store Sale - Mystery Encounter", () => {
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:4:label`, buttonLabel: `${namespace}.option.4.label`,
buttonTooltip: `${namespace}:option:4:tooltip`, buttonTooltip: `${namespace}.option.4.tooltip`,
}); });
}); });

28
src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
View File

@ -64,10 +64,10 @@ describe("Fiery Fallout - Mystery Encounter", () => {
expect(FieryFalloutEncounter.encounterType).toBe(MysteryEncounterType.FIERY_FALLOUT); expect(FieryFalloutEncounter.encounterType).toBe(MysteryEncounterType.FIERY_FALLOUT);
expect(FieryFalloutEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON); expect(FieryFalloutEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
expect(FieryFalloutEncounter.dialogue).toBeDefined(); expect(FieryFalloutEncounter.dialogue).toBeDefined();
expect(FieryFalloutEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(FieryFalloutEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}.intro` }]);
expect(FieryFalloutEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(FieryFalloutEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(FieryFalloutEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(FieryFalloutEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(FieryFalloutEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(FieryFalloutEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(FieryFalloutEncounter.options.length).toBe(3); expect(FieryFalloutEncounter.options.length).toBe(3);
}); });
@ -138,11 +138,11 @@ describe("Fiery Fallout - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}); });
@ -188,11 +188,11 @@ describe("Fiery Fallout - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}); });
@ -235,12 +235,12 @@ describe("Fiery Fallout - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_SPECIAL);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
disabledButtonTooltip: `${namespace}:option:3:disabled_tooltip`, disabledButtonTooltip: `${namespace}.option.3.disabled_tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}); });

34
src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
View File

@ -57,10 +57,10 @@ describe("Lost at Sea - Mystery Encounter", () => {
expect(LostAtSeaEncounter.encounterType).toBe(MysteryEncounterType.LOST_AT_SEA); expect(LostAtSeaEncounter.encounterType).toBe(MysteryEncounterType.LOST_AT_SEA);
expect(LostAtSeaEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON); expect(LostAtSeaEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
expect(LostAtSeaEncounter.dialogue).toBeDefined(); expect(LostAtSeaEncounter.dialogue).toBeDefined();
expect(LostAtSeaEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(LostAtSeaEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}.intro` }]);
expect(LostAtSeaEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(LostAtSeaEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(LostAtSeaEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(LostAtSeaEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(LostAtSeaEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(LostAtSeaEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(LostAtSeaEncounter.options.length).toBe(3); expect(LostAtSeaEncounter.options.length).toBe(3);
}); });
@ -110,13 +110,13 @@ describe("Lost at Sea - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
disabledButtonLabel: `${namespace}:option:1:label_disabled`, disabledButtonLabel: `${namespace}.option.1.label_disabled`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
disabledButtonTooltip: `${namespace}:option:1:tooltip_disabled`, disabledButtonTooltip: `${namespace}.option.1.tooltip_disabled`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}); });
@ -172,13 +172,13 @@ describe("Lost at Sea - Mystery Encounter", () => {
expect(option2.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT); expect(option2.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
expect(option2.dialogue).toBeDefined(); expect(option2.dialogue).toBeDefined();
expect(option2.dialogue).toStrictEqual({ expect(option2.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
disabledButtonLabel: `${namespace}:option:2:label_disabled`, disabledButtonLabel: `${namespace}.option.2.label_disabled`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
disabledButtonTooltip: `${namespace}:option:2:tooltip_disabled`, disabledButtonTooltip: `${namespace}.option.2.tooltip_disabled`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}); });
@ -236,11 +236,11 @@ describe("Lost at Sea - Mystery Encounter", () => {
expect(option3.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option3.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option3.dialogue).toBeDefined(); expect(option3.dialogue).toBeDefined();
expect(option3.dialogue).toStrictEqual({ expect(option3.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}.option.3.label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}.option.3.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:3:selected`, text: `${namespace}.option.3.selected`,
}, },
], ],
}); });

66
src/test/mystery-encounter/encounters/pokemon-salesman-encounter.test.ts → src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
View File

@ -9,7 +9,7 @@ import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
import { PlayerPokemon } from "#app/field/pokemon"; import { PlayerPokemon } from "#app/field/pokemon";
import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
import { PokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/pokemon-salesman-encounter"; import { ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils"; import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
@ -41,7 +41,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
[Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]], [Biome.VOLCANO, [MysteryEncounterType.MYSTERIOUS_CHALLENGERS]],
]); ]);
HUMAN_TRANSITABLE_BIOMES.forEach(biome => { HUMAN_TRANSITABLE_BIOMES.forEach(biome => {
biomeMap.set(biome, [MysteryEncounterType.POKEMON_SALESMAN]); biomeMap.set(biome, [MysteryEncounterType.THE_POKEMON_SALESMAN]);
}); });
vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap); vi.spyOn(MysteryEncounters, "mysteryEncountersByBiome", "get").mockReturnValue(biomeMap);
}); });
@ -53,26 +53,26 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
}); });
it("should have the correct properties", async () => { it("should have the correct properties", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty);
expect(PokemonSalesmanEncounter.encounterType).toBe(MysteryEncounterType.POKEMON_SALESMAN); expect(ThePokemonSalesmanEncounter.encounterType).toBe(MysteryEncounterType.THE_POKEMON_SALESMAN);
expect(PokemonSalesmanEncounter.encounterTier).toBe(MysteryEncounterTier.ULTRA); expect(ThePokemonSalesmanEncounter.encounterTier).toBe(MysteryEncounterTier.ULTRA);
expect(PokemonSalesmanEncounter.dialogue).toBeDefined(); expect(ThePokemonSalesmanEncounter.dialogue).toBeDefined();
expect(PokemonSalesmanEncounter.dialogue.intro).toStrictEqual([ expect(ThePokemonSalesmanEncounter.dialogue.intro).toStrictEqual([
{ text: `${namespace}:intro` }, { text: `${namespace}.intro` },
{ speaker: `${namespace}:speaker`, text: `${namespace}:intro_dialogue` } { speaker: `${namespace}.speaker`, text: `${namespace}.intro_dialogue` }
]); ]);
expect(PokemonSalesmanEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(ThePokemonSalesmanEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(PokemonSalesmanEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(ThePokemonSalesmanEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(PokemonSalesmanEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(ThePokemonSalesmanEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(PokemonSalesmanEncounter.options.length).toBe(2); expect(ThePokemonSalesmanEncounter.options.length).toBe(2);
}); });
it("should not spawn outside of HUMAN_TRANSITABLE_BIOMES", async () => { it("should not spawn outside of HUMAN_TRANSITABLE_BIOMES", async () => {
game.override.startingBiome(Biome.VOLCANO); game.override.startingBiome(Biome.VOLCANO);
await game.runToMysteryEncounter(); await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.POKEMON_SALESMAN); expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.THE_POKEMON_SALESMAN);
}); });
it("should not run below wave 10", async () => { it("should not run below wave 10", async () => {
@ -80,7 +80,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
await game.runToMysteryEncounter(); await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.POKEMON_SALESMAN); expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.THE_POKEMON_SALESMAN);
}); });
it("should not run above wave 179", async () => { it("should not run above wave 179", async () => {
@ -93,19 +93,19 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
it("should initialize fully ", async () => { it("should initialize fully ", async () => {
initSceneWithoutEncounterPhase(scene, defaultParty); initSceneWithoutEncounterPhase(scene, defaultParty);
scene.currentBattle.mysteryEncounter = PokemonSalesmanEncounter; scene.currentBattle.mysteryEncounter = ThePokemonSalesmanEncounter;
const { onInit } = PokemonSalesmanEncounter; const { onInit } = ThePokemonSalesmanEncounter;
expect(PokemonSalesmanEncounter.onInit).toBeDefined(); expect(ThePokemonSalesmanEncounter.onInit).toBeDefined();
PokemonSalesmanEncounter.populateDialogueTokensFromRequirements(scene); ThePokemonSalesmanEncounter.populateDialogueTokensFromRequirements(scene);
const onInitResult = onInit(scene); const onInitResult = onInit(scene);
expect(PokemonSalesmanEncounter.dialogueTokens?.purchasePokemon).toBeDefined(); expect(ThePokemonSalesmanEncounter.dialogueTokens?.purchasePokemon).toBeDefined();
expect(PokemonSalesmanEncounter.dialogueTokens?.price).toBeDefined(); expect(ThePokemonSalesmanEncounter.dialogueTokens?.price).toBeDefined();
expect(PokemonSalesmanEncounter.misc.pokemon instanceof PlayerPokemon).toBeTruthy(); expect(ThePokemonSalesmanEncounter.misc.pokemon instanceof PlayerPokemon).toBeTruthy();
expect(PokemonSalesmanEncounter.misc?.price?.toString()).toBe(PokemonSalesmanEncounter.dialogueTokens?.price); expect(ThePokemonSalesmanEncounter.misc?.price?.toString()).toBe(ThePokemonSalesmanEncounter.dialogueTokens?.price);
expect(onInitResult).toBe(true); expect(onInitResult).toBe(true);
}); });
@ -114,20 +114,20 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
await game.runToMysteryEncounter(); await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.POKEMON_SALESMAN); expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.THE_POKEMON_SALESMAN);
}); });
describe("Option 1 - Purchase the pokemon", () => { describe("Option 1 - Purchase the pokemon", () => {
it("should have the correct properties", () => { it("should have the correct properties", () => {
const option = PokemonSalesmanEncounter.options[0]; const option = ThePokemonSalesmanEncounter.options[0];
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT); expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
expect(option.dialogue).toBeDefined(); expect(option.dialogue).toBeDefined();
expect(option.dialogue).toStrictEqual({ expect(option.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected_message`, text: `${namespace}.option.1.selected_message`,
}, },
], ],
}); });
@ -138,7 +138,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
scene.money = initialMoney; scene.money = initialMoney;
const updateMoneySpy = vi.spyOn(EncounterPhaseUtils, "updatePlayerMoney"); const updateMoneySpy = vi.spyOn(EncounterPhaseUtils, "updatePlayerMoney");
await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty);
await runMysteryEncounterToEnd(game, 1); await runMysteryEncounterToEnd(game, 1);
const price = scene.currentBattle.mysteryEncounter.misc.price; const price = scene.currentBattle.mysteryEncounter.misc.price;
@ -149,7 +149,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
it("Should add the Pokemon to the party", async () => { it("Should add the Pokemon to the party", async () => {
scene.money = 20000; scene.money = 20000;
await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty);
const initialPartySize = scene.getParty().length; const initialPartySize = scene.getParty().length;
const pokemonName = scene.currentBattle.mysteryEncounter.misc.pokemon.name; const pokemonName = scene.currentBattle.mysteryEncounter.misc.pokemon.name;
@ -162,7 +162,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
it("should be disabled if player does not have enough money", async () => { it("should be disabled if player does not have enough money", async () => {
scene.money = 0; scene.money = 0;
await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty);
await game.phaseInterceptor.to(MysteryEncounterPhase, false); await game.phaseInterceptor.to(MysteryEncounterPhase, false);
const encounterPhase = scene.getCurrentPhase(); const encounterPhase = scene.getCurrentPhase();
@ -184,7 +184,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
scene.money = 20000; scene.money = 20000;
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty);
await runMysteryEncounterToEnd(game, 1); await runMysteryEncounterToEnd(game, 1);
expect(leaveEncounterWithoutBattleSpy).toBeCalled(); expect(leaveEncounterWithoutBattleSpy).toBeCalled();
@ -195,7 +195,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
it("should leave encounter without battle", async () => { it("should leave encounter without battle", async () => {
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty);
await runMysteryEncounterToEnd(game, 2); await runMysteryEncounterToEnd(game, 2);
expect(leaveEncounterWithoutBattleSpy).toBeCalled(); expect(leaveEncounterWithoutBattleSpy).toBeCalled();

20
src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
View File

@ -66,10 +66,10 @@ describe("The Strong Stuff - Mystery Encounter", () => {
expect(TheStrongStuffEncounter.encounterType).toBe(MysteryEncounterType.THE_STRONG_STUFF); expect(TheStrongStuffEncounter.encounterType).toBe(MysteryEncounterType.THE_STRONG_STUFF);
expect(TheStrongStuffEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON); expect(TheStrongStuffEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
expect(TheStrongStuffEncounter.dialogue).toBeDefined(); expect(TheStrongStuffEncounter.dialogue).toBeDefined();
expect(TheStrongStuffEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]); expect(TheStrongStuffEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}.intro` }]);
expect(TheStrongStuffEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}:title`); expect(TheStrongStuffEncounter.dialogue.encounterOptionsDialogue.title).toBe(`${namespace}.title`);
expect(TheStrongStuffEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}:description`); expect(TheStrongStuffEncounter.dialogue.encounterOptionsDialogue.description).toBe(`${namespace}.description`);
expect(TheStrongStuffEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}:query`); expect(TheStrongStuffEncounter.dialogue.encounterOptionsDialogue.query).toBe(`${namespace}.query`);
expect(TheStrongStuffEncounter.options.length).toBe(2); expect(TheStrongStuffEncounter.options.length).toBe(2);
}); });
@ -139,11 +139,11 @@ describe("The Strong Stuff - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:1:label`, buttonLabel: `${namespace}.option.1.label`,
buttonTooltip: `${namespace}:option:1:tooltip`, buttonTooltip: `${namespace}.option.1.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:1:selected`, text: `${namespace}.option.1.selected`,
}, },
], ],
}); });
@ -182,11 +182,11 @@ describe("The Strong Stuff - Mystery Encounter", () => {
expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT); expect(option1.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
expect(option1.dialogue).toBeDefined(); expect(option1.dialogue).toBeDefined();
expect(option1.dialogue).toStrictEqual({ expect(option1.dialogue).toStrictEqual({
buttonLabel: `${namespace}:option:2:label`, buttonLabel: `${namespace}.option.2.label`,
buttonTooltip: `${namespace}:option:2:tooltip`, buttonTooltip: `${namespace}.option.2.tooltip`,
selected: [ selected: [
{ {
text: `${namespace}:option:2:selected`, text: `${namespace}.option.2.selected`,
}, },
], ],
}); });