mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-05 16:02:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pagefaultgames:main' into EmoUsedHM01-patch-1

Browse Source
This commit is contained in:
EmoUsedHM01 2024-04-30 21:16:49 +01:00 committed by GitHub
commit 6c1e5bd47c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
71 changed files with 3842 additions and 4050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,5 +33,6 @@ public/images/pokemon/icons/input/output/*
public/images/character/*/
src/data/battle-anim-raw-data*.ts
src/data/battle-anim-data.ts
src/overrides.ts
coverage

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "pokemon-rogue-battle",
"version": "1.0.1",
"version": "1.0.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "pokemon-rogue-battle",
"version": "1.0.1",
"version": "1.0.3",
"dependencies": {
"@material/material-color-utilities": "^0.2.7",
"crypto-js": "^4.2.0",

24
public/images/pokemon/back/shiny/676-dandy.json
View File

@ -4,30 +4,30 @@
"image": "676-dandy.png",
"format": "RGBA8888",
"size": {
"w": 72,
"h": 72
"w": 66,
"h": 66
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 62,
"h": 72
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 62,
"h": 72
"x": 20,
"y": 14,
"w": 56,
"h": 66
},
"frame": {
"x": 0,
"y": 0,
"w": 62,
"h": 72
"w": 56,
"h": 66
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:9a72775f436bbda574bf3721630310fb:f01538e7a19ca3d0d2fea48cd27d8a4c:b5a287256e260744fe6660dc2ceefd11$"
"smartupdate": "$TexturePacker:SmartUpdate:30c2972a226f8e360e323bea40a8005e:232a9bbcc4dba00a033204f1ec06cffd:b5a287256e260744fe6660dc2ceefd11$"
}
}

BIN
public/images/pokemon/back/shiny/676-dandy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 711 B

24
public/images/pokemon/back/shiny/676-debutante.json
View File

@ -4,30 +4,30 @@
"image": "676-debutante.png",
"format": "RGBA8888",
"size": {
"w": 68,
"h": 68
"w": 62,
"h": 62
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 57,
"h": 68
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 57,
"h": 68
"x": 25,
"y": 18,
"w": 51,
"h": 62
},
"frame": {
"x": 0,
"y": 0,
"w": 57,
"h": 68
"w": 51,
"h": 62
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:6d038d8d188d6e545741353c2dd5b812:6f39eb82deb32d251df708f5d4edc9f1:bf2f862a1c8881133f9f3ffbf44602fa$"
"smartupdate": "$TexturePacker:SmartUpdate:5a68081e37dfebc3935ecf4a4fbee3ad:71cbee6966c08512b0617eba3ce34a49:bf2f862a1c8881133f9f3ffbf44602fa$"
}
}

BIN
public/images/pokemon/back/shiny/676-debutante.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 775 B

24
public/images/pokemon/back/shiny/676-diamond.json
View File

@ -4,30 +4,30 @@
"image": "676-diamond.png",
"format": "RGBA8888",
"size": {
"w": 74,
"h": 74
"w": 68,
"h": 68
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 51,
"h": 74
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 51,
"h": 74
"x": 27,
"y": 12,
"w": 45,
"h": 68
},
"frame": {
"x": 0,
"y": 0,
"w": 51,
"h": 74
"w": 45,
"h": 68
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:6e2189160ebb9fff02e9a051ee296d91:47037a1746645a551e31781cb8262e1f:88c467fc09249b0d2f579d44eacd528d$"
"smartupdate": "$TexturePacker:SmartUpdate:2d32af44d56592301808b561e6fa22f6:c70b6710f9c7ebb5268979a777193386:88c467fc09249b0d2f579d44eacd528d$"
}
}

BIN
public/images/pokemon/back/shiny/676-diamond.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 693 B

24
public/images/pokemon/back/shiny/676-heart.json
View File

@ -4,30 +4,30 @@
"image": "676-heart.png",
"format": "RGBA8888",
"size": {
"w": 71,
"h": 71
"w": 65,
"h": 65
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 52,
"h": 71
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 52,
"h": 71
"x": 26,
"y": 15,
"w": 46,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 52,
"h": 71
"w": 46,
"h": 65
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:bd54cfc49b95a12709696441044b115c:dce25f0e6474cad17709f18c96ffb3e5:e11d4dd16bff2ef69bc5ca683c44ca7c$"
"smartupdate": "$TexturePacker:SmartUpdate:e936d451ba0b36434d6444cb1b80f4d9:0b0d0b49e11fcc790a20130e3ab18ca5:e11d4dd16bff2ef69bc5ca683c44ca7c$"
}
}

BIN
public/images/pokemon/back/shiny/676-heart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 717 B

24
public/images/pokemon/back/shiny/676-kabuki.json
View File

@ -4,30 +4,30 @@
"image": "676-kabuki.png",
"format": "RGBA8888",
"size": {
"w": 71,
"h": 71
"w": 65,
"h": 65
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 55,
"h": 71
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 71
"x": 23,
"y": 15,
"w": 49,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 55,
"h": 71
"w": 49,
"h": 65
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:5bd5ad9678c59b2b1d85a6af103ba1ba:2f6c7f2792f64728b478333fc2c65138:c3cad56aa65d2ee971ceebc435a14ee6$"
"smartupdate": "$TexturePacker:SmartUpdate:517d96cd6baa5b7616a51e8c4fed7a55:0a0f239ab3df60459410fab5eba8a4e6:c3cad56aa65d2ee971ceebc435a14ee6$"
}
}

BIN
public/images/pokemon/back/shiny/676-kabuki.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 731 B

24
public/images/pokemon/back/shiny/676-la-reine.json
View File

@ -4,30 +4,30 @@
"image": "676-la-reine.png",
"format": "RGBA8888",
"size": {
"w": 69,
"h": 69
"w": 63,
"h": 63
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 54,
"h": 69
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 54,
"h": 69
"x": 24,
"y": 17,
"w": 48,
"h": 63
},
"frame": {
"x": 0,
"y": 0,
"w": 54,
"h": 69
"w": 48,
"h": 63
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:e01297ffc2dd40460e87b64750997ca6:3261fa54b4c9574937d670de782ca3e8:b99821e87dffda3297dd25a224a9029f$"
"smartupdate": "$TexturePacker:SmartUpdate:e2179e3c9dfa079f84af302283187a80:518e57f1e0614d1aedad1d9826def3d4:b99821e87dffda3297dd25a224a9029f$"
}
}

BIN
public/images/pokemon/back/shiny/676-la-reine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 660 B

24
public/images/pokemon/back/shiny/676-matron.json
View File

@ -4,30 +4,30 @@
"image": "676-matron.png",
"format": "RGBA8888",
"size": {
"w": 68,
"h": 68
"w": 62,
"h": 62
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 68
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 68
"x": 26,
"y": 18,
"w": 47,
"h": 62
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 68
"w": 47,
"h": 62
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:262f28877dc9ef9e7920282c4b36b8dd:18b55adc9c377d1b24d6b236e1f39177:020798583d07c479020bb0af34cf8bb6$"
"smartupdate": "$TexturePacker:SmartUpdate:6c9b45763eb4fedb5ec7099762f23606:884e9813686e91cf2a2cd9f51652a875:020798583d07c479020bb0af34cf8bb6$"
}
}

BIN
public/images/pokemon/back/shiny/676-matron.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 734 B

24
public/images/pokemon/back/shiny/676-pharaoh.json
View File

@ -4,30 +4,30 @@
"image": "676-pharaoh.png",
"format": "RGBA8888",
"size": {
"w": 70,
"h": 70
"w": 64,
"h": 64
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 70
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 70
"x": 25,
"y": 16,
"w": 47,
"h": 64
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 70
"w": 47,
"h": 64
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:a5d56fc494b2194036a8d6d1d876a296:6260eeb9aa48a1047c8ec12842ac28c6:904b7ab6f57249c96beea4b5f72deb53$"
"smartupdate": "$TexturePacker:SmartUpdate:5143f43786377eae745a9355e5e1cc24:158aa35a349be4cf7c56820170aa4546:904b7ab6f57249c96beea4b5f72deb53$"
}
}

BIN
public/images/pokemon/back/shiny/676-pharaoh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 726 B

24
public/images/pokemon/back/shiny/676-star.json
View File

@ -4,30 +4,30 @@
"image": "676-star.png",
"format": "RGBA8888",
"size": {
"w": 72,
"h": 72
"w": 66,
"h": 66
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 54,
"h": 72
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 54,
"h": 72
"x": 24,
"y": 14,
"w": 48,
"h": 66
},
"frame": {
"x": 0,
"y": 0,
"w": 54,
"h": 72
"w": 48,
"h": 66
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:6be66775c485bf44d69f7cd44e346324:c9e3d3db02b6ea0720a20b9bbd159d79:dd7fedf66b493b0bbdef5d25e0041dd8$"
"smartupdate": "$TexturePacker:SmartUpdate:d9af00245cb6498c9dec7508ed563454:12f19bad174b64678e8b8be8455f2b5a:dd7fedf66b493b0bbdef5d25e0041dd8$"
}
}

BIN
public/images/pokemon/back/shiny/676-star.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 734 B

213
public/images/pokemon/back/shiny/678.json
View File

@ -4,219 +4,30 @@
"image": "678.png",
"format": "RGBA8888",
"size": {
"w": 157,
"h": 157
"w": 55,
"h": 55
},
"scale": 1,
"scale": 0.333,
"frames": [
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 25,
"y": 16,
"w": 54,
"h": 60
},
"frame": {
"x": 0,
"y": 0,
"w": 54,
"h": 60
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 25,
"y": 16,
"w": 54,
"h": 60
},
"frame": {
"x": 0,
"y": 0,
"w": 54,
"h": 60
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 25,
"y": 15,
"w": 53,
"h": 61
},
"frame": {
"x": 54,
"y": 0,
"w": 53,
"h": 61
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 25,
"y": 15,
"w": 53,
"h": 61
},
"frame": {
"x": 54,
"y": 0,
"w": 53,
"h": 61
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 24,
"y": 15,
"w": 52,
"h": 61
},
"frame": {
"x": 0,
"y": 60,
"w": 52,
"h": 61
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 24,
"y": 15,
"w": 52,
"h": 61
},
"frame": {
"x": 0,
"y": 60,
"w": 52,
"h": 61
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 26,
"y": 16,
"w": 54,
"h": 60
},
"frame": {
"x": 52,
"y": 61,
"w": 54,
"h": 60
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 24,
"y": 17,
"w": 51,
"h": 59
},
"frame": {
"x": 106,
"y": 61,
"w": 51,
"h": 59
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 24,
"y": 17,
"w": 51,
"h": 59
},
"frame": {
"x": 106,
"y": 61,
"w": 51,
"h": 59
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 23,
"y": 19,
"w": 50,
"h": 57
"x": 25,
"y": 20,
"w": 46,
"h": 55
},
"frame": {
"x": 107,
"x": 0,
"y": 0,
"w": 50,
"h": 57
"w": 46,
"h": 55
}
}
]
@ -225,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:ab77ad452685ab677c7e5e70a386e880:27bb9b07316cb5c401e67e15e2b0f06a:887aa14e4a3a3e9141c6ae460f968db1$"
"smartupdate": "$TexturePacker:SmartUpdate:7b46b2656390e5ddac94370837e7cdaa:7f76286d5acb65066eff0c2532fa7fea:887aa14e4a3a3e9141c6ae460f968db1$"
}
}

BIN
public/images/pokemon/back/shiny/678.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 589 B

24
public/images/pokemon/shiny/676-dandy.json
View File

@ -4,30 +4,30 @@
"image": "676-dandy.png",
"format": "RGBA8888",
"size": {
"w": 71,
"h": 71
"w": 65,
"h": 65
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 56,
"h": 71
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 56,
"h": 71
"x": 22,
"y": 15,
"w": 50,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 56,
"h": 71
"w": 50,
"h": 65
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:cd88917bff3fae3d6ff808096f539d70:17a1912fd81d23ce8a7209e27ad3e9ed:b5a287256e260744fe6660dc2ceefd11$"
"smartupdate": "$TexturePacker:SmartUpdate:30639f5b87709c77f1b970be4078abf4:7b6183e776852f811a1e5c3fa15805fc:b5a287256e260744fe6660dc2ceefd11$"
}
}

BIN
public/images/pokemon/shiny/676-dandy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 759 B

24
public/images/pokemon/shiny/676-debutante.json
View File

@ -4,30 +4,30 @@
"image": "676-debutante.png",
"format": "RGBA8888",
"size": {
"w": 67,
"h": 67
"w": 61,
"h": 61
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 56,
"h": 67
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 56,
"h": 67
"x": 20,
"y": 19,
"w": 50,
"h": 61
},
"frame": {
"x": 0,
"y": 0,
"w": 56,
"h": 67
"w": 50,
"h": 61
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:68f3a2720b7b1e5e59f628f021cac698:07d06d321fff31976e1b993edb972e4f:bf2f862a1c8881133f9f3ffbf44602fa$"
"smartupdate": "$TexturePacker:SmartUpdate:2ccaadba59ae7a3f23287601b725067d:18ae045d433354fd8b461b528bba113d:bf2f862a1c8881133f9f3ffbf44602fa$"
}
}

BIN
public/images/pokemon/shiny/676-debutante.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 794 B

24
public/images/pokemon/shiny/676-diamond.json
View File

@ -4,30 +4,30 @@
"image": "676-diamond.png",
"format": "RGBA8888",
"size": {
"w": 74,
"h": 74
"w": 68,
"h": 68
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 53,
"h": 74
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 53,
"h": 74
"x": 24,
"y": 12,
"w": 47,
"h": 68
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 74
"w": 47,
"h": 68
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:e054ccb4d021c87a6a02c6728403d87a:c7e104da9393ec52b9e6d37f92fc20d9:88c467fc09249b0d2f579d44eacd528d$"
"smartupdate": "$TexturePacker:SmartUpdate:bd55e138e32873b99b7a1a2e237d5278:befb394d45c46c22e2711f4c6d5d9623:88c467fc09249b0d2f579d44eacd528d$"
}
}

BIN
public/images/pokemon/shiny/676-diamond.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 806 B

24
public/images/pokemon/shiny/676-heart.json
View File

@ -4,30 +4,30 @@
"image": "676-heart.png",
"format": "RGBA8888",
"size": {
"w": 72,
"h": 72
"w": 66,
"h": 66
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 54,
"h": 72
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 54,
"h": 72
"x": 24,
"y": 14,
"w": 48,
"h": 66
},
"frame": {
"x": 0,
"y": 0,
"w": 54,
"h": 72
"w": 48,
"h": 66
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:adb921bf32ae497738fbecc12e2aab07:421a40542b16cdb2cc154c85e963b40d:e11d4dd16bff2ef69bc5ca683c44ca7c$"
"smartupdate": "$TexturePacker:SmartUpdate:6a000209d8789ed27cdd0700711ccc27:75157608bd339b63c9a7ce68e259b3b7:e11d4dd16bff2ef69bc5ca683c44ca7c$"
}
}

BIN
public/images/pokemon/shiny/676-heart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 814 B

24
public/images/pokemon/shiny/676-kabuki.json
View File

@ -4,30 +4,30 @@
"image": "676-kabuki.png",
"format": "RGBA8888",
"size": {
"w": 70,
"h": 70
"w": 64,
"h": 64
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 58,
"h": 70
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 58,
"h": 70
"x": 22,
"y": 16,
"w": 52,
"h": 64
},
"frame": {
"x": 0,
"y": 0,
"w": 58,
"h": 70
"w": 52,
"h": 64
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:ef8ecfc1b406aa668e3f8daf0dfbaae7:08eecd31f557298e1570ec3490acffe2:c3cad56aa65d2ee971ceebc435a14ee6$"
"smartupdate": "$TexturePacker:SmartUpdate:cd44f74e9b1dc4a581bd72f235552344:1404c36e03543b4eb1d1a4d5916a6652:c3cad56aa65d2ee971ceebc435a14ee6$"
}
}

BIN
public/images/pokemon/shiny/676-kabuki.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 837 B

24
public/images/pokemon/shiny/676-la-reine.json
View File

@ -4,30 +4,30 @@
"image": "676-la-reine.png",
"format": "RGBA8888",
"size": {
"w": 69,
"h": 69
"w": 63,
"h": 63
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 55,
"h": 69
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 55,
"h": 69
"x": 23,
"y": 17,
"w": 49,
"h": 63
},
"frame": {
"x": 0,
"y": 0,
"w": 55,
"h": 69
"w": 49,
"h": 63
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:6ba780e3e4c772966f8fa209410a9370:c56ae957d7acb10c7373b842af3a8786:b99821e87dffda3297dd25a224a9029f$"
"smartupdate": "$TexturePacker:SmartUpdate:1982df9d4acf87f005bb76829bd78a65:e3590ee437367a91742856b3887339a8:b99821e87dffda3297dd25a224a9029f$"
}
}

BIN
public/images/pokemon/shiny/676-la-reine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 711 B

24
public/images/pokemon/shiny/676-matron.json
View File

@ -4,30 +4,30 @@
"image": "676-matron.png",
"format": "RGBA8888",
"size": {
"w": 68,
"h": 68
"w": 62,
"h": 62
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 52,
"h": 68
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 52,
"h": 68
"x": 23,
"y": 18,
"w": 46,
"h": 62
},
"frame": {
"x": 0,
"y": 0,
"w": 52,
"h": 68
"w": 46,
"h": 62
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:89ab717076c514df8295db07981b18e9:72a9977db421d061829c639e3b50a617:020798583d07c479020bb0af34cf8bb6$"
"smartupdate": "$TexturePacker:SmartUpdate:e2bcb6e27807980dfb68c17e65a7e8bd:d2409a3631a4a2263717bf5aa7e273b2:020798583d07c479020bb0af34cf8bb6$"
}
}

BIN
public/images/pokemon/shiny/676-matron.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 782 B

24
public/images/pokemon/shiny/676-pharaoh.json
View File

@ -4,30 +4,30 @@
"image": "676-pharaoh.png",
"format": "RGBA8888",
"size": {
"w": 69,
"h": 69
"w": 63,
"h": 63
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 52,
"h": 69
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 52,
"h": 69
"x": 25,
"y": 17,
"w": 46,
"h": 63
},
"frame": {
"x": 0,
"y": 0,
"w": 52,
"h": 69
"w": 46,
"h": 63
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:85c709f8538d07088a17e53a7c85afa0:623b4bc6698ef1a984b6bad42e68115b:904b7ab6f57249c96beea4b5f72deb53$"
"smartupdate": "$TexturePacker:SmartUpdate:bdf2959fe7e2556fe6d031d7de04fc6c:fbff7f59a6ed25ee3eef955cbb3b9a56:904b7ab6f57249c96beea4b5f72deb53$"
}
}

BIN
public/images/pokemon/shiny/676-pharaoh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 768 B

24
public/images/pokemon/shiny/676-star.json
View File

@ -4,30 +4,30 @@
"image": "676-star.png",
"format": "RGBA8888",
"size": {
"w": 72,
"h": 72
"w": 66,
"h": 66
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 56,
"h": 72
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 56,
"h": 72
"x": 24,
"y": 14,
"w": 50,
"h": 66
},
"frame": {
"x": 0,
"y": 0,
"w": 56,
"h": 72
"w": 50,
"h": 66
}
}
]
@ -36,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:56c2df4ee634b690a816b79120bc3600:d7eefc05e299310d05d389e05997e449:dd7fedf66b493b0bbdef5d25e0041dd8$"
"smartupdate": "$TexturePacker:SmartUpdate:a3f92eef83bcae7716ee78c669738785:156a85da733d2e878a00be0efc1c4d38:dd7fedf66b493b0bbdef5d25e0041dd8$"
}
}

BIN
public/images/pokemon/shiny/676-star.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 838 B

234
public/images/pokemon/shiny/678.json
View File

@ -4,240 +4,30 @@
"image": "678.png",
"format": "RGBA8888",
"size": {
"w": 130,
"h": 130
"w": 56,
"h": 56
},
"scale": 1,
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 18,
"y": 11,
"w": 44,
"h": 57
"x": 25,
"y": 20,
"w": 45,
"h": 56
},
"frame": {
"x": 0,
"y": 0,
"w": 44,
"h": 57
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 18,
"y": 11,
"w": 44,
"h": 57
},
"frame": {
"x": 0,
"y": 57,
"w": 44,
"h": 57
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 18,
"y": 11,
"w": 44,
"h": 57
},
"frame": {
"x": 0,
"y": 57,
"w": 44,
"h": 57
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 21,
"y": 15,
"w": 44,
"h": 53
},
"frame": {
"x": 44,
"y": 0,
"w": 44,
"h": 53
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 21,
"y": 15,
"w": 44,
"h": 53
},
"frame": {
"x": 44,
"y": 0,
"w": 44,
"h": 53
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 24,
"y": 12,
"w": 42,
"w": 45,
"h": 56
},
"frame": {
"x": 88,
"y": 0,
"w": 42,
"h": 56
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 24,
"y": 12,
"w": 42,
"h": 56
},
"frame": {
"x": 88,
"y": 0,
"w": 42,
"h": 56
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 20,
"y": 11,
"w": 43,
"h": 57
},
"frame": {
"x": 44,
"y": 53,
"w": 43,
"h": 57
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 20,
"y": 11,
"w": 43,
"h": 57
},
"frame": {
"x": 44,
"y": 53,
"w": 43,
"h": 57
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 22,
"y": 13,
"w": 43,
"h": 55
},
"frame": {
"x": 87,
"y": 56,
"w": 43,
"h": 55
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 22,
"y": 13,
"w": 43,
"h": 55
},
"frame": {
"x": 87,
"y": 56,
"w": 43,
"h": 55
}
}
]
@ -246,6 +36,6 @@
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:9579cbb834c4127f905679ba92633a05:64ed3d991add5e47034b1ca9aad80a4c:887aa14e4a3a3e9141c6ae460f968db1$"
"smartupdate": "$TexturePacker:SmartUpdate:ee6cbb7807c28f4b3f12e8dcf4da4888:77056356d7cbf2a4fb20508f50dbd3ce:887aa14e4a3a3e9141c6ae460f968db1$"
}
}

BIN
public/images/pokemon/shiny/678.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 746 B

6079
public/images/pokemon_icons_6.json
View File

File diff suppressed because it is too large Load Diff

BIN
public/images/pokemon_icons_6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

23
src/battle-scene.ts
View File

@ -60,25 +60,10 @@ import { SceneBase } from './scene-base';
import CandyBar from './ui/candy-bar';
import { Variant, variantData } from './data/variant';
import { Localizable } from './plugins/i18n';
import { STARTING_WAVE_OVERRIDE, OPP_SPECIES_OVERRIDE, SEED_OVERRIDE, STARTING_BIOME_OVERRIDE } from './overrides';
export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
export const SEED_OVERRIDE = '';
export const STARTER_SPECIES_OVERRIDE = 0;
export const STARTER_FORM_OVERRIDE = 0;
export const STARTING_LEVEL_OVERRIDE = 0;
export const STARTING_WAVE_OVERRIDE = 0;
export const STARTING_BIOME_OVERRIDE = Biome.TOWN;
export const STARTING_MONEY_OVERRIDE = 0;
export const ABILITY_OVERRIDE = Abilities.NONE;
export const MOVE_OVERRIDE = Moves.NONE;
export const OPP_SPECIES_OVERRIDE = 0;
export const OPP_ABILITY_OVERRIDE = Abilities.NONE;
export const OPP_MOVE_OVERRIDE = Moves.NONE;
export const OPP_SHINY_OVERRIDE = false;
export const OPP_VARIANT_OVERRIDE = 0;
const DEBUG_RNG = false;
export const startingWave = STARTING_WAVE_OVERRIDE || 1;
@ -1056,6 +1041,8 @@ export default class BattleScene extends SceneBase {
case Species.BASCULIN:
case Species.DEERLING:
case Species.SAWSBUCK:
case Species.FROAKIE:
case Species.FROGADIER:
case Species.VIVILLON:
case Species.FLABEBE:
case Species.FLOETTE:
@ -1066,6 +1053,10 @@ export default class BattleScene extends SceneBase {
case Species.TATSUGIRI:
case Species.PALDEA_TAUROS:
return Utils.randSeedInt(species.forms.length);
case Species.GRENINJA:
return Utils.randSeedInt(2);
case Species.ZYGARDE:
return Utils.randSeedInt(3);
case Species.MINIOR:
return Utils.randSeedInt(6);
case Species.ALCREMIE:

45
src/data/ability.ts
View File

@ -976,16 +976,19 @@ export class FieldMoveTypePowerBoostAbAttr extends FieldMovePowerBoostAbAttr {
export class BattleStatMultiplierAbAttr extends AbAttr {
private battleStat: BattleStat;
private multiplier: number;
private condition: PokemonAttackCondition;
constructor(battleStat: BattleStat, multiplier: number) {
constructor(battleStat: BattleStat, multiplier: number, condition?: PokemonAttackCondition) {
super(false);
this.battleStat = battleStat;
this.multiplier = multiplier;
this.condition = condition;
}
applyBattleStat(pokemon: Pokemon, passive: boolean, battleStat: BattleStat, statValue: Utils.NumberHolder, args: any[]): boolean | Promise<boolean> {
if (battleStat === this.battleStat) {
const move = (args[0] as Move);
if (battleStat === this.battleStat && (!this.condition || this.condition(pokemon, null, move))) {
statValue.value *= this.multiplier;
return true;
}
@ -1148,6 +1151,26 @@ class PostVictoryStatChangeAbAttr extends PostVictoryAbAttr {
}
}
export class PostVictoryFormChangeAbAttr extends PostVictoryAbAttr {
private formFunc: (p: Pokemon) => integer;
constructor(formFunc: ((p: Pokemon) => integer)) {
super(true);
this.formFunc = formFunc;
}
applyPostVictory(pokemon: Pokemon, passive: boolean, args: any[]): boolean | Promise<boolean> {
const formIndex = this.formFunc(pokemon);
if (formIndex !== pokemon.formIndex) {
pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
return true;
}
return false;
}
}
export class PostKnockOutAbAttr extends AbAttr {
applyPostKnockOut(pokemon: Pokemon, passive: boolean, knockedOut: Pokemon, args: any[]): boolean | Promise<boolean> {
return false;
@ -1382,6 +1405,7 @@ export class TraceAbAttr extends PostSummonAbAttr {
const targets = pokemon.getOpponents();
if (!targets.length)
return false;
let target: Pokemon;
if (targets.length > 1)
pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);
@ -1407,6 +1431,9 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean {
const targets = pokemon.getOpponents();
if (!targets.length)
return false;
let target: Pokemon;
if (targets.length > 1)
pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);
@ -2622,8 +2649,8 @@ export function initAbilities() {
new Ability(Abilities.TRUANT, 3)
.attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.TRUANT, 1, false),
new Ability(Abilities.HUSTLE, 3)
.attr(BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5)
.attr(BattleStatMultiplierAbAttr, BattleStat.ACC, 0.8),
.attr(BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5, (user, target, move) => move.category == MoveCategory.PHYSICAL)
.attr(BattleStatMultiplierAbAttr, BattleStat.ACC, 0.8, (user, target, move) => move.category == MoveCategory.PHYSICAL),
new Ability(Abilities.CUTE_CHARM, 3)
.attr(PostDefendContactApplyTagChanceAbAttr, 30, BattlerTagType.INFATUATED),
new Ability(Abilities.PLUS, 3)
@ -3067,17 +3094,21 @@ export function initAbilities() {
.ignorable()
.partial(),
new Ability(Abilities.BATTLE_BOND, 7)
.attr(PostVictoryFormChangeAbAttr, p => p.getFormKey() ? 2 : 1)
.attr(UncopiableAbilityAbAttr)
.attr(UnswappableAbilityAbAttr)
.attr(UnsuppressableAbilityAbAttr)
.attr(NoFusionAbilityAbAttr)
.unimplemented(),
new Ability(Abilities.POWER_CONSTRUCT, 7)
.partial(),
new Ability(Abilities.POWER_CONSTRUCT, 7) // TODO: 10% Power Construct Zygarde isn't accounted for yet. If changed, update Zygarde's getSpeciesFormIndex entry accordingly
.attr(PostBattleInitFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2)
.attr(PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2)
.attr(PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2)
.attr(UncopiableAbilityAbAttr)
.attr(UnswappableAbilityAbAttr)
.attr(UnsuppressableAbilityAbAttr)
.attr(NoFusionAbilityAbAttr)
.unimplemented(),
.partial(),
new Ability(Abilities.CORROSION, 7)
.unimplemented(),
new Ability(Abilities.COMATOSE, 7)

31
src/data/arena-tag.ts
View File

@ -1,10 +1,10 @@
import { Arena } from "../field/arena";
import { Type } from "./type";
import * as Utils from "../utils";
import { MoveCategory, StatChangeAttr, allMoves } from "./move";
import { MoveCategory, allMoves } from "./move";
import { getPokemonMessage } from "../messages";
import Pokemon, { HitResult, PokemonMove } from "../field/pokemon";
import { MoveEffectPhase, StatChangePhase } from "../phases";
import { MoveEffectPhase, PokemonHealPhase, StatChangePhase} from "../phases";
import { StatusEffect } from "./status-effect";
import { BattlerIndex } from "../battle";
import { Moves } from "./enums/moves";
@ -146,6 +146,31 @@ class AuroraVeilTag extends WeakenMoveScreenTag {
}
}
class WishTag extends ArenaTag {
private battlerIndex: BattlerIndex;
private triggerMessage: string;
private healHp: number;
constructor(turnCount: integer, sourceId: integer, side: ArenaTagSide) {
super(ArenaTagType.WISH, turnCount, Moves.WISH, sourceId, side);
}
onAdd(arena: Arena): void {
const user = arena.scene.getPokemonById(this.sourceId);
this.battlerIndex = user.getBattlerIndex();
this.triggerMessage = getPokemonMessage(user, '\'s wish\ncame true!');
this.healHp = Math.max(Math.floor(user.getMaxHp() / 2), 1);
}
onRemove(arena: Arena): void {
const target = arena.scene.getField()[this.battlerIndex];
if (target?.isActive(true)) {
arena.scene.queueMessage(this.triggerMessage);
arena.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(), this.healHp, null, true, false));
}
}
}
export class WeakenMoveTypeTag extends ArenaTag {
private weakenedType: Type;
@ -472,6 +497,8 @@ export function getArenaTag(tagType: ArenaTagType, turnCount: integer, sourceMov
case ArenaTagType.FUTURE_SIGHT:
case ArenaTagType.DOOM_DESIRE:
return new DelayedAttackTag(tagType, sourceMove, sourceId, targetIndex);
case ArenaTagType.WISH:
return new WishTag(turnCount, sourceId, side);
case ArenaTagType.STEALTH_ROCK:
return new StealthRockTag(sourceId, side);
case ArenaTagType.STICKY_WEB:

4
src/data/egg-moves.ts
View File

@ -62,7 +62,7 @@ export const speciesEggMoves = {
[Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.LIQUIDATION, Moves.DRAGON_ASCENT ],
[Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.BOOMBURST ],
[Species.DITTO]: [ Moves.MIMIC, Moves.COPYCAT, Moves.ME_FIRST, Moves.METRONOME ],
[Species.EEVEE]: [ Moves.WISH, Moves.REVELATION_DANCE, Moves.SIZZLY_SLIDE, Moves.NO_RETREAT ],
[Species.EEVEE]: [ Moves.WISH, Moves.REVELATION_DANCE, Moves.TRI_ATTACK, Moves.NO_RETREAT ],
[Species.PORYGON]: [ Moves.BUZZY_BUZZ, Moves.AURA_SPHERE, Moves.TOPSY_TURVY, Moves.TECHNO_BLAST ],
[Species.OMANYTE]: [ Moves.SCALD, Moves.EARTH_POWER, Moves.POWER_GEM, Moves.STRENGTH_SAP ],
[Species.KABUTO]: [ Moves.CEASELESS_EDGE, Moves.DRILL_RUN, Moves.AQUA_CUTTER, Moves.MIGHTY_CLEAVE ],
@ -81,7 +81,7 @@ export const speciesEggMoves = {
[Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.THIEF, Moves.PARTING_SHOT, Moves.SPORE ],
[Species.SPINARAK]: [ Moves.PARTING_SHOT, Moves.MEGAHORN, Moves.SILK_TRAP, Moves.STRENGTH_SAP ],
[Species.CHINCHOU]: [ Moves.THUNDERCLAP, Moves.BOUNCY_BUBBLE, Moves.VOLT_SWITCH, Moves.TAIL_GLOW ],
[Species.PICHU]: [ Moves.PIKA_PAPOW, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.ZIPPY_ZAP ],
[Species.PICHU]: [ Moves.THUNDERCLAP, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.THUNDER_CAGE ],
[Species.CLEFFA]: [ Moves.TAKE_HEART, Moves.POWER_GEM, Moves.WISH, Moves.LIGHT_OF_RUIN ],
[Species.IGGLYBUFF]: [ Moves.MOONBLAST, Moves.APPLE_ACID, Moves.WISH, Moves.BOOMBURST ],
[Species.TOGEPI]: [ Moves.SCORCHING_SANDS, Moves.ROOST, Moves.MOONBLAST, Moves.FIERY_DANCE ],

1
src/data/enums/arena-tag-type.ts
View File

@ -8,6 +8,7 @@ export enum ArenaTagType {
MIST = "MIST",
FUTURE_SIGHT = "FUTURE_SIGHT",
DOOM_DESIRE = "DOOM_DESIRE",
WISH = "WISH",
STEALTH_ROCK = "STEALTH_ROCK",
STICKY_WEB = "STICKY_WEB",
TRICK_ROOM = "TRICK_ROOM",

24
src/data/move.ts
View File

@ -3099,11 +3099,23 @@ export class RandomMovesetMoveAttr extends OverrideMoveEffectAttr {
const moveTargets = getMoveTargets(user, move.moveId);
if (!moveTargets.targets.length)
return false;
const targets = moveTargets.multiple || moveTargets.targets.length === 1
? moveTargets.targets
: moveTargets.targets.indexOf(target.getBattlerIndex()) > -1
? [ target.getBattlerIndex() ]
: [ moveTargets.targets[user.randSeedInt(moveTargets.targets.length)] ];
let selectTargets: BattlerIndex[];
switch (true) {
case (moveTargets.multiple || moveTargets.targets.length === 1): {
selectTargets = moveTargets.targets;
break;
}
case (moveTargets.targets.indexOf(target.getBattlerIndex()) > -1): {
selectTargets = [ target.getBattlerIndex() ];
break;
}
default: {
moveTargets.targets.splice(moveTargets.targets.indexOf(user.getAlly().getBattlerIndex()));
selectTargets = [ moveTargets.targets[user.randSeedInt(moveTargets.targets.length)] ];
break;
}
}
const targets = selectTargets;
user.getMoveQueue().push({ move: move.moveId, targets: targets, ignorePP: true });
user.scene.unshiftPhase(new MovePhase(user.scene, user, targets, moveset[moveIndex], true));
return true;
@ -4481,7 +4493,7 @@ export function initMoves() {
.attr(AbilityCopyAttr),
new SelfStatusMove(Moves.WISH, Type.NORMAL, -1, 10, -1, 0, 3)
.triageMove()
.unimplemented(),
.attr(AddArenaTagAttr, ArenaTagType.WISH, 2, true),
new SelfStatusMove(Moves.ASSIST, Type.NORMAL, -1, 20, -1, 0, 3)
.attr(RandomMovesetMoveAttr, true)
.ignoresVirtual(),

10
src/data/pokemon-forms.ts
View File

@ -542,11 +542,21 @@ export const pokemonFormChanges: PokemonFormChanges = {
new SpeciesFormChange(Species.MELOETTA, 'pirouette', 'aria', new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true),
new SpeciesFormChange(Species.MELOETTA, 'pirouette', 'aria', new SpeciesFormChangeActiveTrigger(false), true)
],
[Species.GRENINJA]: [
new SpeciesFormChange(Species.GRENINJA, 'battle-bond', 'ash', new SpeciesFormChangeManualTrigger(), true),
new SpeciesFormChange(Species.GRENINJA, 'ash', 'battle-bond', new SpeciesFormChangeManualTrigger(), true)
],
[Species.AEGISLASH]: [
new SpeciesFormChange(Species.AEGISLASH, 'blade', 'shield', new SpeciesFormChangePreMoveTrigger(Moves.KINGS_SHIELD), true, new SpeciesFormChangeCondition(p => p.hasAbility(Abilities.STANCE_CHANGE))),
new SpeciesFormChange(Species.AEGISLASH, 'shield', 'blade', new SpeciesFormChangePreMoveTrigger(m => allMoves[m].category !== MoveCategory.STATUS), true, new SpeciesFormChangeCondition(p => p.hasAbility(Abilities.STANCE_CHANGE))),
new SpeciesFormChange(Species.AEGISLASH, 'blade', 'shield', new SpeciesFormChangeActiveTrigger(false), true)
],
[Species.ZYGARDE]: [
new SpeciesFormChange(Species.ZYGARDE, '50-pc', 'complete', new SpeciesFormChangeManualTrigger(), true),
new SpeciesFormChange(Species.ZYGARDE, 'complete', '50-pc', new SpeciesFormChangeManualTrigger(), true),
new SpeciesFormChange(Species.ZYGARDE, '10-pc', 'complete', new SpeciesFormChangeManualTrigger(), true),
new SpeciesFormChange(Species.ZYGARDE, 'complete', '10-pc', new SpeciesFormChangeManualTrigger(), true)
],
[Species.DIANCIE]: [
new SpeciesFormChange(Species.DIANCIE, '', SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.DIANCITE))
],

194
src/data/pokemon-level-moves.ts
View File

@ -396,9 +396,10 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 36, Moves.THUNDERBOLT ],
[ 40, Moves.LIGHT_SCREEN ],
[ 44, Moves.THUNDER ],
[ 48, Moves.PIKA_PAPOW ],
],
[Species.RAICHU]: [
[ 0, Moves.THUNDER_PUNCH ],
[ 0, Moves.ZIPPY_ZAP ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.GROWL ],
[ 1, Moves.THUNDER_SHOCK ],
@ -418,7 +419,9 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.ELECTRO_BALL ],
[ 1, Moves.PLAY_NICE ],
[ 1, Moves.NUZZLE ],
[ 1, Moves.THUNDER_PUNCH ],
[ 5, Moves.THUNDERBOLT ],
[ 50, Moves.PIKA_PAPOW ],
],
[Species.SANDSHREW]: [
[ 1, Moves.SCRATCH ],
@ -2231,9 +2234,10 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 45, Moves.CHARM ],
[ 50, Moves.DOUBLE_EDGE ],
[ 55, Moves.LAST_RESORT ],
[ 60, Moves.VEEVEE_VOLLEY ],
],
[Species.VAPOREON]: [
[ 0, Moves.WATER_GUN ],
[ 0, Moves.BOUNCY_BUBBLE ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -2247,19 +2251,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.HAZE ],
[ 25, Moves.WATER_PULSE ],
[ 30, Moves.AURORA_BEAM ],
[ 35, Moves.AQUA_RING ],
[ 40, Moves.MUDDY_WATER ],
[ 45, Moves.ACID_ARMOR ],
[ 50, Moves.HYDRO_PUMP ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.WATER_GUN ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.HAZE ],
[ 30, Moves.WATER_PULSE ],
[ 35, Moves.AURORA_BEAM ],
[ 40, Moves.AQUA_RING ],
[ 45, Moves.MUDDY_WATER ],
[ 50, Moves.ACID_ARMOR ],
[ 55, Moves.HYDRO_PUMP ],
[ 60, Moves.LAST_RESORT ],
],
[Species.JOLTEON]: [
[ 0, Moves.THUNDER_SHOCK ],
[ 0, Moves.BUZZY_BUZZ ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -2273,19 +2278,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.THUNDER_WAVE ],
[ 25, Moves.DOUBLE_KICK ],
[ 30, Moves.THUNDER_FANG ],
[ 35, Moves.PIN_MISSILE ],
[ 40, Moves.DISCHARGE ],
[ 45, Moves.AGILITY ],
[ 50, Moves.THUNDER ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.THUNDER_SHOCK ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.THUNDER_WAVE ],
[ 30, Moves.DOUBLE_KICK ],
[ 35, Moves.THUNDER_FANG ],
[ 40, Moves.PIN_MISSILE ],
[ 45, Moves.DISCHARGE ],
[ 50, Moves.AGILITY ],
[ 55, Moves.THUNDER ],
[ 60, Moves.LAST_RESORT ],
],
[Species.FLAREON]: [
[ 0, Moves.EMBER ],
[ 0, Moves.SIZZLY_SLIDE ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -2298,16 +2304,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.SMOG ],
[ 25, Moves.BITE ],
[ 30, Moves.FIRE_FANG ],
[ 35, Moves.FIRE_SPIN ],
[ 40, Moves.LAVA_PLUME ],
[ 45, Moves.SCARY_FACE ],
[ 50, Moves.FLARE_BLITZ ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.EMBER ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.SMOG ],
[ 30, Moves.BITE ],
[ 35, Moves.FIRE_FANG ],
[ 40, Moves.FIRE_SPIN ],
[ 45, Moves.LAVA_PLUME ],
[ 50, Moves.SCARY_FACE ],
[ 55, Moves.FLARE_BLITZ ],
[ 60, Moves.LAST_RESORT ],
],
[Species.PORYGON]: [
[ 1, Moves.TACKLE ],
@ -3325,7 +3332,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 52, Moves.EARTHQUAKE ],
],
[Species.ESPEON]: [
[ 0, Moves.CONFUSION ],
[ 0, Moves.GLITZY_GLOW ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -3338,19 +3345,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.SWIFT ],
[ 25, Moves.PSYBEAM ],
[ 30, Moves.MORNING_SUN ],
[ 35, Moves.POWER_SWAP ],
[ 40, Moves.PSYCHIC ],
[ 45, Moves.PSYCH_UP ],
[ 50, Moves.FUTURE_SIGHT ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.CONFUSION ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.SWIFT ],
[ 30, Moves.PSYBEAM ],
[ 35, Moves.MORNING_SUN ],
[ 40, Moves.POWER_SWAP ],
[ 45, Moves.PSYCHIC ],
[ 50, Moves.PSYCH_UP ],
[ 55, Moves.FUTURE_SIGHT ],
[ 60, Moves.LAST_RESORT ],
],
[Species.UMBREON]: [
[ 0, Moves.SNARL ],
[ 0, Moves.BADDY_BAD ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -3364,16 +3372,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.CONFUSE_RAY ],
[ 25, Moves.ASSURANCE ],
[ 30, Moves.MOONLIGHT ],
[ 35, Moves.GUARD_SWAP ],
[ 40, Moves.DARK_PULSE ],
[ 45, Moves.SCREECH ],
[ 50, Moves.MEAN_LOOK ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.SNARL ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.CONFUSE_RAY ],
[ 30, Moves.ASSURANCE ],
[ 35, Moves.MOONLIGHT ],
[ 40, Moves.GUARD_SWAP ],
[ 45, Moves.DARK_PULSE ],
[ 50, Moves.SCREECH ],
[ 55, Moves.MEAN_LOOK ],
[ 60, Moves.LAST_RESORT ],
],
[Species.MURKROW]: [
[ 1, Moves.PECK ],
@ -5586,7 +5595,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[Species.SPINDA]: [
[ 1, Moves.TACKLE ],
[ 5, Moves.COPYCAT ],
[ 10, Moves.TEETER_DANCE ],
[ 10, Moves.DIZZY_PUNCH ],
[ 14, Moves.PSYBEAM ],
[ 19, Moves.HYPNOSIS ],
[ 23, Moves.BODY_SLAM ],
@ -7932,7 +7941,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 49, Moves.U_TURN ],
],
[Species.LEAFEON]: [
[ 0, Moves.RAZOR_LEAF ],
[ 0, Moves.SAPPY_SEED ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -7946,19 +7955,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.LEECH_SEED ],
[ 25, Moves.MAGICAL_LEAF ],
[ 30, Moves.SYNTHESIS ],
[ 35, Moves.SUNNY_DAY ],
[ 40, Moves.GIGA_DRAIN ],
[ 45, Moves.SWORDS_DANCE ],
[ 50, Moves.LEAF_BLADE ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.RAZOR_LEAF ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.LEECH_SEED ],
[ 30, Moves.MAGICAL_LEAF ],
[ 35, Moves.SYNTHESIS ],
[ 40, Moves.SUNNY_DAY ],
[ 45, Moves.GIGA_DRAIN ],
[ 50, Moves.SWORDS_DANCE ],
[ 55, Moves.LEAF_BLADE ],
[ 60, Moves.LAST_RESORT ],
],
[Species.GLACEON]: [
[ 0, Moves.ICY_WIND ],
[ 0, Moves.FREEZY_FROST ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -7971,16 +7981,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.ICE_SHARD ],
[ 25, Moves.BITE ],
[ 30, Moves.ICE_FANG ],
[ 35, Moves.SNOWSCAPE ],
[ 40, Moves.FREEZE_DRY ],
[ 45, Moves.MIRROR_COAT ],
[ 50, Moves.BLIZZARD ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.ICY_WIND ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.ICE_SHARD ],
[ 30, Moves.BITE ],
[ 35, Moves.ICE_FANG ],
[ 40, Moves.SNOWSCAPE ],
[ 45, Moves.FREEZE_DRY ],
[ 50, Moves.MIRROR_COAT ],
[ 55, Moves.BLIZZARD ],
[ 60, Moves.LAST_RESORT ],
],
[Species.GLISCOR]: [
[ 1, Moves.SAND_ATTACK ],
@ -11822,7 +11833,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 66, Moves.HYPER_BEAM ],
],
[Species.SYLVEON]: [
[ 0, Moves.DISARMING_VOICE ],
[ 0, Moves.SPARKLY_SWIRL ],
[ 1, Moves.TACKLE ],
[ 1, Moves.TAKE_DOWN ],
[ 1, Moves.DOUBLE_EDGE ],
@ -11835,16 +11846,17 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.COVET ],
[ 1, Moves.COPYCAT ],
[ 5, Moves.SAND_ATTACK ],
[ 10, Moves.QUICK_ATTACK ],
[ 15, Moves.BABY_DOLL_EYES ],
[ 20, Moves.SWIFT ],
[ 25, Moves.LIGHT_SCREEN ],
[ 30, Moves.DRAINING_KISS ],
[ 35, Moves.MISTY_TERRAIN ],
[ 40, Moves.SKILL_SWAP ],
[ 45, Moves.PSYCH_UP ],
[ 50, Moves.MOONBLAST ],
[ 55, Moves.LAST_RESORT ],
[ 10, Moves.DISARMING_VOICE ],
[ 15, Moves.QUICK_ATTACK ],
[ 20, Moves.BABY_DOLL_EYES ],
[ 25, Moves.SWIFT ],
[ 30, Moves.LIGHT_SCREEN ],
[ 35, Moves.DRAINING_KISS ],
[ 40, Moves.MISTY_TERRAIN ],
[ 45, Moves.SKILL_SWAP ],
[ 50, Moves.PSYCH_UP ],
[ 55, Moves.MOONBLAST ],
[ 60, Moves.LAST_RESORT ],
],
[Species.HAWLUCHA]: [
[ 1, Moves.TACKLE ],
@ -17237,6 +17249,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.ALOLA_RAICHU]: [
[ 0, Moves.PSYCHIC ],
[ 0, Moves.ZIPPY_ZAP ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.GROWL ],
[ 1, Moves.THUNDER_SHOCK ],
@ -17257,6 +17270,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.PLAY_NICE ],
[ 1, Moves.NUZZLE ],
[ 5, Moves.THUNDERBOLT ],
[ 50, Moves.PIKA_PAPOW ],
],
[Species.ALOLA_SANDSHREW]: [
[ 1, Moves.SCRATCH ],

10
src/data/pokemon-species.ts
View File

@ -1748,8 +1748,14 @@ export function initSpecies() {
new PokemonSpecies(Species.FENNEKIN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 0.4, 9.4, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 307, 40, 45, 40, 62, 60, 60, 45, 70, 61, GrowthRate.MEDIUM_SLOW, 87.5, false),
new PokemonSpecies(Species.BRAIXEN, 6, false, false, false, "Fox Pokémon", Type.FIRE, null, 1, 14.5, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 409, 59, 59, 58, 90, 70, 73, 45, 70, 143, GrowthRate.MEDIUM_SLOW, 87.5, false),
new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", Type.FIRE, Type.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 240, GrowthRate.MEDIUM_SLOW, 87.5, false),
new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
new PokemonForm("Normal", "", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63),
new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, ""),
),
new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
new PokemonForm("Normal", "", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142),
new PokemonForm("Battle Bond", "battle-bond", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, ""),
),
new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false, false,
new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239),
new PokemonForm("Battle Bond", "battle-bond", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, false, ""),

2
src/data/trainer-names.ts
View File

@ -97,7 +97,7 @@ export const trainerNamePools = {
[TrainerType.MAID]: ["Belinda","Sophie","Emily","Elena","Clare","Alica","Tanya","Tammy"],
[TrainerType.MUSICIAN]: ["Boris","Preston","Charles","Clyde","Vincent","Dalton","Kirk","Shawn","Fabian","Fernando","Joseph","Marcos","Arturo","Jerry","Lonnie","Tony"],
[TrainerType.NURSERY_AIDE]: ["Autumn","Briana","Leah","Miho","Ethel","Hollie","Ilse","June","Kimya","Rosalyn"],
[TrainerType.OFFICER]: ["Dirk","Keith","Alex","Bobby","Caleb","Danny","Dylan","Thomas","Daniel","Jeff","Braven","Dell","Neagle","Haruki","Mitchell","Sheriff","Raymond"],
[TrainerType.OFFICER]: ["Dirk","Keith","Alex","Bobby","Caleb","Danny","Dylan","Thomas","Daniel","Jeff","Braven","Dell","Neagle","Haruki","Mitchell","Raymond"],
[TrainerType.PARASOL_LADY]: ["Angelica","Clarissa","Madeline","Akari","Annabell","Kayley","Rachel","Alexa","Sabrina","April","Gwyneth","Laura","Lumi","Mariah","Melita","Nicole","Tihana","Ingrid","Tyra"],
[TrainerType.PILOT]: ["Chase","Leonard","Ted","Elron","Ewing","Flynn","Winslow"],
[TrainerType.POKEFAN]: [["Alex","Allan","Brandon","Carter","Colin","Derek","Jeremy","Joshua","Rex","Robert","Trevor","William","Colton","Miguel","Francisco","Kaleb","Leonard","Boone","Elliot","Jude","Norbert","Corey","Gabe","Baxter"],["Beverly","Georgia","Jaime","Ruth","Isabel","Marissa","Vanessa","Annika","Bethany","Kimberly","Meredith","Rebekah","Eleanor","Darcy","Lydia","Sachiko","Abigail","Agnes","Lydie","Roisin","Tara","Carmen","Janet"]],

3
src/field/arena.ts
View File

@ -18,8 +18,7 @@ import { TimeOfDay } from "../data/enums/time-of-day";
import { Terrain, TerrainType } from "../data/terrain";
import { PostTerrainChangeAbAttr, PostWeatherChangeAbAttr, applyPostTerrainChangeAbAttrs, applyPostWeatherChangeAbAttrs } from "../data/ability";
import Pokemon from "./pokemon";
const WEATHER_OVERRIDE = WeatherType.NONE;
import { WEATHER_OVERRIDE } from '../overrides';
export class Arena {
public scene: BattleScene;

5
src/field/pokemon.ts
View File

@ -1,5 +1,5 @@
import Phaser from 'phaser';
import BattleScene, { ABILITY_OVERRIDE, AnySound, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../battle-scene';
import BattleScene, { AnySound } from '../battle-scene';
import { Variant, VariantSet, variantColorCache } from '#app/data/variant';
import { variantData } from '#app/data/variant';
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info';
@ -43,6 +43,7 @@ import { Nature, getNatureStatMultiplier } from '../data/nature';
import { SpeciesFormChange, SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from '../data/pokemon-forms';
import { TerrainType } from '../data/terrain';
import { TrainerSlot } from '../data/trainer-config';
import { ABILITY_OVERRIDE, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../overrides';
export enum FieldPosition {
CENTER,
@ -657,7 +658,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
getHpRatio(precise: boolean = false): number {
return precise
? this.hp / this.getMaxHp()
: ((this.hp / this.getMaxHp()) * 100) / 100;
: Math.round((this.hp / this.getMaxHp()) * 100) / 100;
}
generateGender(): void {

3
src/game-mode.ts
View File

@ -1,10 +1,11 @@
import { fixedBattles } from "./battle";
import BattleScene, { STARTING_BIOME_OVERRIDE, STARTING_LEVEL_OVERRIDE, STARTING_MONEY_OVERRIDE } from "./battle-scene";
import BattleScene from "./battle-scene";
import { Biome } from "./data/enums/biome";
import { Species } from "./data/enums/species";
import PokemonSpecies, { allSpecies } from "./data/pokemon-species";
import { Arena } from "./field/arena";
import * as Utils from "./utils";
import { STARTING_BIOME_OVERRIDE, STARTING_LEVEL_OVERRIDE, STARTING_MONEY_OVERRIDE } from './overrides';
export enum GameModes {
CLASSIC,

5
src/locales/de/menu.ts
View File

@ -59,4 +59,9 @@ export const menu: SimpleTranslationEntries = {
"escapeVerbSwitch": "auswechseln",
"escapeVerbFlee": "flucht",
"notDisabled": "{{moveName}} ist\nnicht mehr deaktiviert!",
"rankings": "Rankings",
"dailyRankings": "Daily Rankings",
"noRankings": "No Rankings",
"loading": "Loading…",
"playersOnline": "Players Online"
} as const;

366
src/locales/de/pokemon.ts
View File

@ -387,102 +387,102 @@ export const pokemon: SimpleTranslationEntries = {
"rayquaza": "Rayquaza",
"jirachi": "Jirachi",
"deoxys": "Deoxys",
"turtwig": "Turtwig",
"grotle": "Grotle",
"torterra": "Torterra",
"chimchar": "Chimchar",
"monferno": "Monferno",
"infernape": "Infernape",
"piplup": "Piplup",
"prinplup": "Prinplup",
"empoleon": "Empoleon",
"starly": "Starly",
"turtwig": "Chelast",
"grotle": "Chelcarain",
"torterra": "Chelterrar",
"chimchar": "Panflam",
"monferno": "Panpyro",
"infernape": "Panferno",
"piplup": "Plinfa",
"prinplup": "Pilprin",
"empoleon": "Impoleon",
"starly": "Staralili",
"staravia": "Staravia",
"staraptor": "Staraptor",
"bidoof": "Bidoof",
"bibarel": "Bibarel",
"kricketot": "Kricketot",
"kricketune": "Kricketune",
"shinx": "Shinx",
"bidoof": "Bidiza",
"bibarel": "Bidifas",
"kricketot": "Zirpurze",
"kricketune": "Zirpeise",
"shinx": "Sheinux",
"luxio": "Luxio",
"luxray": "Luxray",
"budew": "Budew",
"budew": "Knospi",
"roserade": "Roserade",
"cranidos": "Cranidos",
"rampardos": "Rampardos",
"shieldon": "Shieldon",
"bastiodon": "Bastiodon",
"cranidos": "Koknodon",
"rampardos": "Rameidon",
"shieldon": "Schilterus",
"bastiodon": "Bollterus",
"burmy": "Burmy",
"wormadam": "Wormadam",
"mothim": "Mothim",
"combee": "Combee",
"vespiquen": "Vespiquen",
"wormadam": "Burmadame",
"mothim": "Moterpel",
"combee": "Wadribie",
"vespiquen": "Hornwiesel",
"pachirisu": "Pachirisu",
"buizel": "Buizel",
"floatzel": "Floatzel",
"cherubi": "Cherubi",
"cherrim": "Cherrim",
"shellos": "Shellos",
"buizel": "Bamelin",
"floatzel": "Bojelin",
"cherubi": "Kikugi",
"cherrim": "Kinoso",
"shellos": "Schalellos",
"gastrodon": "Gastrodon",
"ambipom": "Ambipom",
"drifloon": "Drifloon",
"drifblim": "Drifblim",
"buneary": "Buneary",
"lopunny": "Lopunny",
"mismagius": "Mismagius",
"honchkrow": "Honchkrow",
"glameow": "Glameow",
"purugly": "Purugly",
"chingling": "Chingling",
"stunky": "Stunky",
"ambipom": "Ambidifel",
"drifloon": "Driftlon",
"drifblim": "Drifzepeli",
"buneary": "Haspiror",
"lopunny": "Schlapor",
"mismagius": "Traunmagil",
"honchkrow": "Kramshef",
"glameow": "Charmian",
"purugly": "Shnurgarst",
"chingling": "Klingplim",
"stunky": "Skunkapuh",
"skuntank": "Skuntank",
"bronzor": "Bronzor",
"bronzor": "Bronzel",
"bronzong": "Bronzong",
"bonsly": "Bonsly",
"mime_jr": "Mime Jr.",
"happiny": "Happiny",
"chatot": "Chatot",
"spiritomb": "Spiritomb",
"gible": "Gible",
"gabite": "Gabite",
"garchomp": "Garchomp",
"munchlax": "Munchlax",
"bonsly": "Mobai",
"mime_jr": "Pantimimi",
"happiny": "Wonneira",
"chatot": "Plaudagei",
"spiritomb": "Kryppuk",
"gible": "Kaumalat",
"gabite": "Knarksel",
"garchomp": "Knackrack",
"munchlax": "Mampfaxo",
"riolu": "Riolu",
"lucario": "Lucario",
"hippopotas": "Hippopotas",
"hippowdon": "Hippowdon",
"skorupi": "Skorupi",
"drapion": "Drapion",
"croagunk": "Croagunk",
"toxicroak": "Toxicroak",
"carnivine": "Carnivine",
"hippowdon": "Hippoterus",
"skorupi": "Pionskora",
"drapion": "Piondragi",
"croagunk": "Glibunkel",
"toxicroak": "Toxiquak",
"carnivine": "Venuflibis",
"finneon": "Finneon",
"lumineon": "Lumineon",
"mantyke": "Mantyke",
"snover": "Snover",
"abomasnow": "Abomasnow",
"weavile": "Weavile",
"mantyke": "Mantirps",
"snover": "Shnebedeck",
"abomasnow": "Rexblisar",
"weavile": "Snibunna",
"magnezone": "Magnezone",
"lickilicky": "Lickilicky",
"rhyperior": "Rhyperior",
"tangrowth": "Tangrowth",
"electivire": "Electivire",
"magmortar": "Magmortar",
"lickilicky": "Schlurplek",
"rhyperior": "Rihornior",
"tangrowth": "Tangoloss",
"electivire": "Elevoltek",
"magmortar": "Magbrant",
"togekiss": "Togekiss",
"yanmega": "Yanmega",
"leafeon": "Leafeon",
"glaceon": "Glaceon",
"gliscor": "Gliscor",
"mamoswine": "Mamoswine",
"leafeon": "Folipurba",
"glaceon": "Glaziola",
"gliscor": "Skorgro",
"mamoswine": "Mamutel",
"porygon_z": "Porygon-Z",
"gallade": "Gallade",
"probopass": "Probopass",
"dusknoir": "Dusknoir",
"froslass": "Froslass",
"gallade": "Galagladi",
"probopass": "Voluminas",
"dusknoir": "Zwirrfinst",
"froslass": "Frosdedje",
"rotom": "Rotom",
"uxie": "Uxie",
"mesprit": "Mesprit",
"azelf": "Azelf",
"uxie": "Selfe",
"mesprit": "Vesprit",
"azelf": "Tobutz",
"dialga": "Dialga",
"palkia": "Palkia",
"heatran": "Heatran",
@ -495,116 +495,116 @@ export const pokemon: SimpleTranslationEntries = {
"shaymin": "Shaymin",
"arceus": "Arceus",
"victini": "Victini",
"snivy": "Snivy",
"servine": "Servine",
"serperior": "Serperior",
"tepig": "Tepig",
"pignite": "Pignite",
"emboar": "Emboar",
"oshawott": "Oshawott",
"dewott": "Dewott",
"samurott": "Samurott",
"patrat": "Patrat",
"watchog": "Watchog",
"lillipup": "Lillipup",
"herdier": "Herdier",
"stoutland": "Stoutland",
"purrloin": "Purrloin",
"liepard": "Liepard",
"pansage": "Pansage",
"simisage": "Simisage",
"pansear": "Pansear",
"simisear": "Simisear",
"panpour": "Panpour",
"simipour": "Simipour",
"munna": "Munna",
"musharna": "Musharna",
"pidove": "Pidove",
"tranquill": "Tranquill",
"unfezant": "Unfezant",
"blitzle": "Blitzle",
"zebstrika": "Zebstrika",
"roggenrola": "Roggenrola",
"boldore": "Boldore",
"gigalith": "Gigalith",
"woobat": "Woobat",
"swoobat": "Swoobat",
"drilbur": "Drilbur",
"excadrill": "Excadrill",
"audino": "Audino",
"timburr": "Timburr",
"gurdurr": "Gurdurr",
"conkeldurr": "Conkeldurr",
"tympole": "Tympole",
"palpitoad": "Palpitoad",
"seismitoad": "Seismitoad",
"throh": "Throh",
"sawk": "Sawk",
"sewaddle": "Sewaddle",
"swadloon": "Swadloon",
"leavanny": "Leavanny",
"venipede": "Venipede",
"whirlipede": "Whirlipede",
"scolipede": "Scolipede",
"cottonee": "Cottonee",
"whimsicott": "Whimsicott",
"petilil": "Petilil",
"lilligant": "Lilligant",
"basculin": "Basculin",
"sandile": "Sandile",
"krokorok": "Krokorok",
"krookodile": "Krookodile",
"darumaka": "Darumaka",
"darmanitan": "Darmanitan",
"maractus": "Maractus",
"dwebble": "Dwebble",
"crustle": "Crustle",
"scraggy": "Scraggy",
"scrafty": "Scrafty",
"sigilyph": "Sigilyph",
"yamask": "Yamask",
"cofagrigus": "Cofagrigus",
"tirtouga": "Tirtouga",
"carracosta": "Carracosta",
"archen": "Archen",
"archeops": "Archeops",
"trubbish": "Trubbish",
"garbodor": "Garbodor",
"snivy": "Serpifeu",
"servine": "Efoserp",
"serperior": "Serpiroyal",
"tepig": "Floink",
"pignite": "Ferkokel",
"emboar": "Flambirex",
"oshawott": "Ottaro",
"dewott": "Zwottronin",
"samurott": "Admurai",
"patrat": "Nagelotz",
"watchog": "Kukmarda",
"lillipup": "Yorkleff",
"herdier": "Terribark",
"stoutland": "Bissbark",
"purrloin": "Felilou",
"liepard": "Kleoparda",
"pansage": "Vegimak",
"simisage": "Vegichita",
"pansear": "Grillmak",
"simisear": "Grillchita",
"panpour": "Sodamak",
"simipour": "Sodachita",
"munna": "Somniam",
"musharna": "Somnivora",
"pidove": "Dusslgurr",
"tranquill": "Navitaub",
"unfezant": "Fasasnob",
"blitzle": "Elezeba",
"zebstrika": "Zebritz",
"roggenrola": "Kiesling",
"boldore": "Sedimantur",
"gigalith": "Brockoloss",
"woobat": "Fleknoil",
"swoobat": "Fletiamo",
"drilbur": "Rotomurf",
"excadrill": "Stalobor",
"audino": "Ohrdoch",
"timburr": "Praktibalk",
"gurdurr": "Strepoli",
"conkeldurr": "Meistagriff",
"tympole": "Schallquap",
"palpitoad": "Membrana",
"seismitoad": "Branawarz",
"throh": "Juitesto",
"sawk": "Karadonis",
"sewaddle": "Strawickl",
"swadloon": "Folikon",
"leavanny": "Matrifol",
"venipede": "Toxiped",
"whirlipede": "Rollum",
"scolipede": "Cerapendra",
"cottonee": "Waumboll",
"whimsicott": "Elfun",
"petilil": "Lilminip",
"lilligant": "Dressella",
"basculin": "Barschuft",
"sandile": "Ganovil",
"krokorok": "Rokkaiman",
"krookodile": "Rabigator",
"darumaka": "Flampion",
"darmanitan": "Flampavian",
"maractus": "Maracamba",
"dwebble": "Lithomith",
"crustle": "Castellith",
"scraggy": "Zurrokex",
"scrafty": "Irokex",
"sigilyph": "Symvolara",
"yamask": "Makabaja",
"cofagrigus": "Echnatoll",
"tirtouga": "Galapaflos",
"carracosta": "Karippas",
"archen": "Flapteryx",
"archeops": "Aeropteryx",
"trubbish": "Unratütox",
"garbodor": "Deponitox",
"zorua": "Zorua",
"zoroark": "Zoroark",
"minccino": "Minccino",
"cinccino": "Cinccino",
"gothita": "Gothita",
"gothorita": "Gothorita",
"gothitelle": "Gothitelle",
"solosis": "Solosis",
"duosion": "Duosion",
"reuniclus": "Reuniclus",
"ducklett": "Ducklett",
"swanna": "Swanna",
"vanillite": "Vanillite",
"vanillish": "Vanillish",
"vanilluxe": "Vanilluxe",
"deerling": "Deerling",
"sawsbuck": "Sawsbuck",
"minccino": "Picochilla",
"cinccino": "Chillabell",
"gothita": "Mollimorba",
"gothorita": "Hypnomorba",
"gothitelle": "Morbitesse",
"solosis": "Monozyto",
"duosion": "Mitodos",
"reuniclus": "Zytomega",
"ducklett": "Piccolente",
"swanna": "Swaroness",
"vanillite": "Gelatini",
"vanillish": "Gelatroppo",
"vanilluxe": "Gelatwino",
"deerling": "Sesokitz",
"sawsbuck": "Kronjuwild",
"emolga": "Emolga",
"karrablast": "Karrablast",
"escavalier": "Escavalier",
"foongus": "Foongus",
"amoonguss": "Amoonguss",
"frillish": "Frillish",
"jellicent": "Jellicent",
"alomomola": "Alomomola",
"joltik": "Joltik",
"galvantula": "Galvantula",
"ferroseed": "Ferroseed",
"ferrothorn": "Ferrothorn",
"klink": "Klink",
"klang": "Klang",
"klinklang": "Klinklang",
"tynamo": "Tynamo",
"eelektrik": "Eelektrik",
"eelektross": "Eelektross",
"karrablast": "Laukaps",
"escavalier": "Cavalanzas",
"foongus": "Tarnpignon",
"amoonguss": "Hutsassa",
"frillish": "Quabbel",
"jellicent": "Apoquallyp",
"alomomola": "Mamolida",
"joltik": "Wattzapf",
"galvantula": "Voltula",
"ferroseed": "Kastadur",
"ferrothorn": "Tentantel",
"klink": "Klikk",
"klang": "Kliklak",
"klinklang": "Klikdiklak",
"tynamo": "Zapplardin",
"eelektrik": "Zapplalek",
"eelektross": "Zapplarang",
"elgyem": "Elgyem",
"beheeyem": "Beheeyem",
"litwick": "Litwick",

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

@ -78,4 +78,9 @@ export const menu: SimpleTranslationEntries = {
"skipItemQuestion": "Are you sure you want to skip taking an item?",
"eggHatching": "Oh?",
"ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?",
"rankings": "Rankings",
"dailyRankings": "Daily Rankings",
"noRankings": "No Rankings",
"loading": "Loading…",
"playersOnline": "Players Online"
} as const;

7
src/locales/es/menu.ts
View File

@ -61,5 +61,10 @@ export const menu: SimpleTranslationEntries = {
"notDisabled": "¡El movimiento {{moveName}}\nya no está anulado!",
"skipItemQuestion": "¿Estás seguro de que no quieres coger un objeto?",
"eggHatching": "¿Y esto?",
"ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?"
"ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?",
"rankings": "Rankings",
"dailyRankings": "Daily Rankings",
"noRankings": "No Rankings",
"loading": "Loading…",
"playersOnline": "Players Online"
} as const;

5
src/locales/fr/menu.ts
View File

@ -73,4 +73,9 @@ export const menu: SimpleTranslationEntries = {
"skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre d’objet ?",
"eggHatching": "Oh ?",
"ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?",
"rankings": "Rankings",
"dailyRankings": "Daily Rankings",
"noRankings": "No Rankings",
"loading": "Loading…",
"playersOnline": "Players Online"
} as const;

61
src/locales/fr/tutorial.ts
View File

@ -1,38 +1,43 @@
import { SimpleTranslationEntries } from "#app/plugins/i18n";
export const tutorial: SimpleTranslationEntries = {
"intro": `Welcome to PokéRogue! This is a battle-focused Pokémon fangame with roguelite elements.
$This game is not monetized and we claim no ownership of Pokémon nor of the copyrighted assets used.
$The game is a work in progress, but fully playable.\nFor bug reports, please use the Discord community.
$If the game runs slowly, please ensure 'Hardware Acceleration' is turned on in your browser settings.`,
"intro": `Bienvenue dans PokéRogue, un fangame axé sur les combats Pokémon avec des éléments roguelite !
$Ce jeu n’est pas monétisé et nous ne prétendons pas à la propriété de Pokémon, ni des éléments sous copyright
$utilisés.
$Ce jeu est toujours en développement, mais entièrement jouable.
$Tout signalement de bugs passe par le serveur Discord.
$Si le jeu est lent, vérifiez que l’Accélération Matérielle est activée dans les paramètres du navigateur.`,
"accessMenu": `To access the menu, press M or Escape while awaiting input.\nThe menu contains settings and various features.`,
"accessMenu": `Accédez au menu avec M ou Échap lors de l'attente d’une\naction.
$Il contient les paramètres et diverses fonctionnalités`,
"menu": `From this menu you can access the settings.
$From the settings you can change game speed, window style, and other options.
$There are also various other features here, so be sure to check them all!`,
"menu": `Vous pouvez accéder aux paramètres depuis ce menu.
$Vous pouvez entre autres y changer la vitesse du jeu ou le style de fenêtre.
$Il y a également toute une variété d’autres fonctionnalités,
$jetez-y un œil !`,
"starterSelect": `From this screen, you can select your starters.\nThese are your initial party members.
$Each starter has a value. Your party can have up to\n6 members as long as the total does not exceed 10.
$You can also select gender, ability, and form depending on\nthe variants you've caught or hatched.
$The IVs for a species are also the best of every one you've\ncaught or hatched, so try to get lots of the same species!`,
"starterSelect": `Choisissez vos starters depuis cet écran.\nIls formeront votre équipe de départ.
$Chacun possède une valeur. Votre équipe peut avoir jusqu’à\n6 membres, tant que vous ne dépassez pas un coût de 10.
$Vous pouvez aussi choisir le sexe, le talent et la forme en\nfonction des variants déjà capturés ou éclos.
$Les IVs d’un starter sont les meilleurs de tous ceux de son\nespèce déjà obtenus. Essayez donc d’en obtenir plusieurs !`,
"pokerus": `A daily random 3 selectable starters have a purple border.
$If you see a starter you own with one of these,\ntry adding it to your party. Be sure to check its summary!`,
"pokerus": `Chaque jour, 3 starters tirés aléatoirement ont un contour
$violet. Si un starter que vous possédez l’a, essayez de
$ l’ajouter à votre équipe. Vérifiez bien son résumé !`,
"selectItem": `After every battle, you are given a choice of 3 random items.\nYou may only pick one.
$These range from consumables, to Pokémon held items, to passive permanent items.
$Most non-consumable item effects will stack in various ways.
$Some items will only show up if they can be used, such as evolution items.
$You can also transfer held items between Pokémon using the transfer option.
$The transfer option will appear in the bottom right once you have obtained a held item.
$You may purchase consumable items with money, and a larger variety will be available the further you get.
$Be sure to buy these before you pick your random item, as it will progress to the next battle once you do.`,
"selectItem": `Après chaque combat, vous avez le choix entre 3 objets\ntirés au sort. Vous ne pouvez en prendre qu’un.
$Cela peut être des objets consommables, des objets à\nfaire tenir, ou des objets passifs aux effets permanents.
$La plupart des effets des objets non-consommables se cumuleront de diverses manières.
$Certains objets apparaîtront s’ils peuvent être utilisés, comme les objets d’évolution.
$Vous pouvez aussi transférer des objets tenus entre Pokémon en utilisant l’option de transfert.
$L’option de transfert apparaît en bas à droite dès que vous avez obtenu un objet à faire tenir.
$Vous pouvez acheter des consommables avec de l’argent.\nPlus vous progressez, plus le choix sera varié.
$Choisir un des objets gratuits déclenchera le prochain combat, donc faites bien tous vos achats avant.`,
"eggGacha": `From this screen, you can redeem your vouchers for\nPokémon eggs.
$Eggs have to be hatched and get closer to hatching after\nevery battle. Rarer eggs take longer to hatch.
$Hatched Pokémon also won't be added to your party, they will\nbe added to your starters.
$Pokémon hatched from eggs generally have better IVs than\nwild Pokémon.
$Some Pokémon can only even be obtained from eggs.
$There are 3 different machines to pull from with different\nbonuses, so pick the one that suits you best!`,
"eggGacha": `Depuis cet écran, vous pouvez échanger vos coupons\ncontre des Œufs de Pokémon.
$Les Œufs éclosent après avoir remporté un certain nombre\nde combats. Les plus rares mettent plus de temps.
$Les Pokémon éclos ne rejoindront pas votre équipe,\nmais seront ajoutés à vos starters.
$Les Pokémon issus d’Œufs ont généralement de\nmeilleurs IVs que les Pokémon sauvages.
$Certains Pokémon ne peuvent être obtenus\nque dans des Œufs.
$Il y a 3 différentes machines à actionner avec différents\nbonus, prenez celle qui vous convient le mieux !`,
} as const;

7
src/locales/it/menu.ts
View File

@ -6,5 +6,10 @@ export const menu: SimpleTranslationEntries = {
"newGame": "Nuova Partita",
"loadGame": "Carica Partita",
"dailyRun": "Corsa Giornaliera (Beta)",
"selectGameMode": "Seleziona una modalità di gioco."
"selectGameMode": "Seleziona una modalità di gioco.",
"rankings": "Rankings",
"dailyRankings": "Daily Rankings",
"noRankings": "No Rankings",
"loading": "Loading…",
"playersOnline": "Players Online"
} as const;

23
src/overrides.ts Normal file
View File

@ -0,0 +1,23 @@
import { Species } from './data/enums/species';
import { Abilities } from "./data/enums/abilities";
import { Biome } from "./data/enums/biome";
import { Moves } from "./data/enums/moves";
import { WeatherType } from "./data/weather";
export const SEED_OVERRIDE = '';
export const STARTER_SPECIES_OVERRIDE = 0;
export const STARTER_FORM_OVERRIDE = 0;
export const STARTING_LEVEL_OVERRIDE = 0;
export const STARTING_WAVE_OVERRIDE = 0;
export const STARTING_BIOME_OVERRIDE = Biome.TOWN;
export const STARTING_MONEY_OVERRIDE = 0;
export const WEATHER_OVERRIDE = WeatherType.NONE;
export const ABILITY_OVERRIDE = Abilities.NONE;
export const MOVE_OVERRIDE = Moves.NONE;
export const OPP_SPECIES_OVERRIDE = 0;
export const OPP_ABILITY_OVERRIDE = Abilities.NONE;
export const OPP_MOVE_OVERRIDE = Moves.NONE;
export const OPP_SHINY_OVERRIDE = false;
export const OPP_VARIANT_OVERRIDE = 0;

5
src/phases.ts
View File

@ -1,4 +1,4 @@
import BattleScene, { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE, bypassLogin, startingWave } from "./battle-scene";
import BattleScene, { bypassLogin, startingWave } from "./battle-scene";
import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove, MoveResult, DamageResult, FieldPosition, HitResult, TurnMove } from "./field/pokemon";
import * as Utils from './utils';
import { Moves } from "./data/enums/moves";
@ -58,6 +58,7 @@ import { fetchDailyRunSeed, getDailyRunStarters } from "./data/daily-run";
import { GameModes, gameModes } from "./game-mode";
import { getPokemonSpecies, speciesStarters } from "./data/pokemon-species";
import i18next from './plugins/i18n';
import { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE } from './overrides';
export class LoginPhase extends Phase {
private showText: boolean;
@ -2548,7 +2549,7 @@ export class MoveEffectPhase extends PokemonPhase {
: 3 / (3 + Math.min(targetEvasionLevel.value - userAccuracyLevel.value, 6));
}
applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, user, BattleStat.ACC, accuracyMultiplier);
applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, user, BattleStat.ACC, accuracyMultiplier, this.move.getMove());
const evasionMultiplier = new Utils.NumberHolder(1);
applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, this.getTarget(), BattleStat.EVA, evasionMultiplier);

9
src/ui/daily-run-scoreboard.ts
View File

@ -2,6 +2,7 @@ import BattleScene from "../battle-scene";
import { TextStyle, addTextObject } from "./text";
import { WindowVariant, addWindow } from "./ui-theme";
import * as Utils from "../utils";
import i18next from "i18next";
interface RankingEntry {
rank: integer,
@ -39,7 +40,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
const titleWindow = addWindow(this.scene, 0, 0, 114, 18, false, false, null, null, WindowVariant.THIN);
this.add(titleWindow);
this.titleLabel = addTextObject(this.scene, titleWindow.displayWidth / 2, titleWindow.displayHeight / 2, 'Daily Rankings', TextStyle.WINDOW, { fontSize: '64px' });
this.titleLabel = addTextObject(this.scene, titleWindow.displayWidth / 2, titleWindow.displayHeight / 2, i18next.t('menu:dailyRankings'), TextStyle.WINDOW, { fontSize: '64px' });
this.titleLabel.setOrigin(0.5, 0.5);
this.add(this.titleLabel);
@ -141,7 +142,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
update(category: ScoreboardCategory = this.category, page: integer = this.page) {
this.rankingsContainer.removeAll(true);
this.loadingLabel.setText('Loading…');
this.loadingLabel.setText(i18next.t('menu:loading'));
this.loadingLabel.setVisible(true);
if (category !== this.category)
@ -155,7 +156,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
.then(jsonResponse => {
this.page = page;
this.category = category;
this.titleLabel.setText(`${Utils.toReadableString(ScoreboardCategory[category])} Rankings`);
this.titleLabel.setText(`${Utils.toReadableString(ScoreboardCategory[category])} ${i18next.t("menu:rankings")}`);
this.prevPageButton.setAlpha(page > 1 ? 1 : 0.5);
this.nextPageButton.setAlpha(page < this.pageCount ? 1 : 0.5);
this.pageNumberLabel.setText(page.toString());
@ -163,7 +164,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
this.loadingLabel.setVisible(false);
this.updateRankings(jsonResponse);
} else
this.loadingLabel.setText('No Rankings');
this.loadingLabel.setText(i18next.t('menu:noRankings'));
});
});
}

15
src/ui/party-ui-handler.ts
View File

@ -383,6 +383,7 @@ export default class PartyUiHandler extends MessageUiHandler {
}
const slotCount = this.partySlots.length;
const battlerCount = this.scene.currentBattle.getBattlerCount();
switch (button) {
case Button.UP:
@ -392,14 +393,20 @@ export default class PartyUiHandler extends MessageUiHandler {
success = this.setCursor(this.cursor < 6 ? this.cursor < slotCount - 1 ? this.cursor + 1 : 6 : 0);
break;
case Button.LEFT:
if (this.cursor >= this.scene.currentBattle.getBattlerCount() && this.cursor < 6)
if (this.cursor >= battlerCount && this.cursor <= 6)
success = this.setCursor(0);
break;
case Button.RIGHT:
const battlerCount = this.scene.currentBattle.getBattlerCount();
if (slotCount > battlerCount && this.cursor < battlerCount)
success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount);
if (slotCount === battlerCount){
success = this.setCursor(6);
break;
} else if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1){
success = this.setCursor(2);
break;
} else if (slotCount > battlerCount && this.cursor < battlerCount){
success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount);
break;
}
}
}

2
src/ui/starter-select-ui-handler.ts
View File

@ -1319,7 +1319,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.setTypeIcons(speciesForm.type1, speciesForm.type2);
this.pokemonSprite.clearTint();
if (this.pokerusCursors.find((cursor: integer, i: integer) => cursor === this.cursor && this.pokerusGens[i] === this.genCursor))
if (this.pokerusCursors.find((cursor: integer, i: integer) => cursor === this.cursor && this.pokerusGens[i] === this.getGenCursorWithScroll()))
handleTutorial(this.scene, Tutorial.Pokerus);
} else {
this.pokemonGrowthRateText.setText('');

31
src/ui/summary-ui-handler.ts
View File

@ -364,9 +364,16 @@ export default class SummaryUiHandler extends UiHandler {
case Button.LEFT:
this.moveSelect = false;
this.setCursor(Page.STATS);
this.hideMoveEffect();
success = true;
break;
if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE){
this.hideMoveEffect();
this.destroyBlinkCursor();
success = true;
break;
} else {
this.hideMoveSelect();
success = true;
break;
}
}
}
} else {
@ -426,11 +433,9 @@ export default class SummaryUiHandler extends UiHandler {
}
setCursor(cursor: integer, overrideChanged: boolean = false): boolean {
let changed: boolean;
let changed: boolean = overrideChanged || this.moveCursor !== cursor;
if (this.moveSelect) {
changed = overrideChanged || this.moveCursor !== cursor;
if (changed) {
this.moveCursor = cursor;
const selectedMove = this.getSelectedMove();
@ -462,7 +467,6 @@ export default class SummaryUiHandler extends UiHandler {
y: `-=${14.83 * (moveDescriptionLineCount - 3)}`
});
}
}
if (!this.moveCursorObj) {
this.moveCursorObj = this.scene.add.sprite(-2, 0, 'summary_moves_cursor', 'highlight');
@ -527,6 +531,11 @@ export default class SummaryUiHandler extends UiHandler {
this.setCursor(0, true);
this.showMoveEffect();
}
else if (this.cursor===Page.MOVES) {
this.moveCursorObj = null;
this.showMoveSelect();
this.showMoveEffect();
}
}
else
this.summaryPageTransitionContainer.x -= 214;
@ -871,6 +880,12 @@ export default class SummaryUiHandler extends UiHandler {
this.moveSelect = false;
this.extraMoveRowContainer.setVisible(false);
this.moveDescriptionText.setText('');
this.destroyBlinkCursor();
this.hideMoveEffect();
}
destroyBlinkCursor(){
if (this.moveCursorBlinkTimer) {
this.moveCursorBlinkTimer.destroy();
this.moveCursorBlinkTimer = null;
@ -883,8 +898,6 @@ export default class SummaryUiHandler extends UiHandler {
this.selectedMoveCursorObj.destroy();
this.selectedMoveCursorObj = null;
}
this.hideMoveEffect();
}
showMoveEffect(instant?: boolean) {

5
src/ui/title-ui-handler.ts
View File

@ -5,6 +5,7 @@ import { Mode } from "./ui";
import * as Utils from "../utils";
import { TextStyle, addTextObject } from "./text";
import { battleCountSplashMessage, splashMessages } from "../data/splash-messages";
import i18next from "i18next";
export default class TitleUiHandler extends OptionSelectUiHandler {
private titleContainer: Phaser.GameObjects.Container;
@ -37,7 +38,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
this.titleContainer.add(this.dailyRunScoreboard);
this.playerCountLabel = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 90, '? Players Online', TextStyle.MESSAGE, { fontSize: '54px' });
this.playerCountLabel = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 90, `? ${i18next.t("menu:playersOnline")}`, TextStyle.MESSAGE, { fontSize: '54px' });
this.playerCountLabel.setOrigin(1, 0);
this.titleContainer.add(this.playerCountLabel);
@ -61,7 +62,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
Utils.apiFetch(`game/titlestats`)
.then(request => request.json())
.then(stats => {
this.playerCountLabel.setText(`${stats.playerCount} Players Online`);
this.playerCountLabel.setText(`${stats.playerCount} ${i18next.t("menu:playersOnline")}`);
if (this.splashMessage === battleCountSplashMessage)
this.splashMessageText.setText(battleCountSplashMessage.replace('{COUNT}', stats.battleCount.toLocaleString('en-US')));
});