Skip to content

Commit 6ca6dad

Browse files
committed
1 parent 0f1abea commit 6ca6dad

38 files changed

Lines changed: 285 additions & 145 deletions

client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"build"
1616
],
1717
"dependencies": {
18-
"@pkmn/data": "^0.9.36",
18+
"@pkmn/data": "^0.9.37",
1919
"@pkmn/protocol": "^0.7.0"
2020
},
2121
"devDependencies": {
22-
"@pkmn/dex": "^0.9.36"
22+
"@pkmn/dex": "^0.9.37"
2323
},
2424
"scripts": {
2525
"lint": "eslint --cache src",

data/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pkmn/data",
3-
"version": "0.9.36",
3+
"version": "0.9.37",
44
"description": "A forked implementation of the Pokémon Showdown client's data layer",
55
"repository": "github:pkmn/ps",
66
"license": "MIT",
@@ -16,12 +16,12 @@
1616
"build"
1717
],
1818
"dependencies": {
19-
"@pkmn/dex-types": "^0.9.36"
19+
"@pkmn/dex-types": "^0.9.37"
2020
},
2121
"devDependencies": {
22-
"@pkmn/dex": "^0.9.36",
23-
"@pkmn/mods": "^0.9.36",
24-
"@pkmn/sim": "^0.9.36",
22+
"@pkmn/dex": "^0.9.37",
23+
"@pkmn/mods": "^0.9.37",
24+
"@pkmn/sim": "^0.9.37",
2525
"@smogon/calc": "^0.10.0"
2626
},
2727
"scripts": {

dex/data/aliases.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
"gen6ag": "[Gen 6] Anything Goes",
9090
"crossevo": "[Gen 9] Cross Evolution",
9191
"mayhem": "[Gen 9] Random Battle Mayhem",
92-
"omotm": "[Gen 9] Tier Shift",
93-
"lcotm": "[Gen 9] Pure Hackmons",
92+
"omotm": "[Gen 9] Alphabet Cup",
93+
"lcotm": "[Gen 9] Inheritance",
9494
"megasnow": "Abomasnow-Mega",
9595
"maero": "Aerodactyl-Mega",
9696
"malt": "Altaria-Mega",

dex/data/learnsets.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131492,6 +131492,7 @@
131492131492
"calmmind": ["9M", "7M", "6M"],
131493131493
"camouflage": ["7E", "6E"],
131494131494
"captivate": ["7E", "6E"],
131495+
"celebrate": ["9S0"],
131495131496
"charm": ["9M"],
131496131497
"chillingwater": ["9M"],
131497131498
"confide": ["7M", "6M"],
@@ -131506,7 +131507,7 @@
131506131507
"endure": ["9M"],
131507131508
"energyball": ["9M", "7M", "6M"],
131508131509
"facade": ["9M", "7M", "6M"],
131509-
"fairywind": ["9L6", "7L6", "6L6"],
131510+
"fairywind": ["9L6", "9S0", "7L6", "6L6"],
131510131511
"flash": ["6M"],
131511131512
"frustration": ["7M", "6M"],
131512131513
"gigadrain": ["9M", "7T", "6T"],
@@ -131549,10 +131550,19 @@
131549131550
"terablast": ["9M"],
131550131551
"toxic": ["7M", "6M"],
131551131552
"trailblaze": ["9M"],
131552-
"vinewhip": ["9L1", "7L1", "6L1"],
131553-
"wish": ["9L20", "7L20", "6L20"],
131553+
"vinewhip": ["9L1", "9S0", "7L1", "6L1"],
131554+
"wish": ["9L20", "9S0", "7L20", "6L20"],
131554131555
"worryseed": ["7T", "6T"]
131555-
}
131556+
},
131557+
"eventData": [
131558+
{
131559+
"generation": 9,
131560+
"level": 5,
131561+
"abilities": ["flowerveil"],
131562+
"moves": ["vinewhip", "fairywind", "wish", "celebrate"],
131563+
"pokeball": "cherishball"
131564+
}
131565+
]
131556131566
},
131557131567
"floette": {
131558131568
"learnset": {

dex/data/moves.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3909,7 +3909,7 @@
39093909
},
39103910
"healingwish": {
39113911
"inherit": true,
3912-
"condition": {"duration": 2, "onSwitchInPriority": 1},
3912+
"condition": {"duration": 2},
39133913
"desc": "The user faints and the Pokemon brought out to replace it has its HP fully restored along with having any non-volatile status condition cured. The new Pokemon is sent out at the end of the turn, and the healing happens before hazards take effect. Fails if the user is the last unfainted Pokemon in its party.",
39143914
"shortDesc": "User faints. Replacement is fully healed."
39153915
},
@@ -3972,7 +3972,7 @@
39723972
"luckychant": {"inherit": true, "isNonstandard": null},
39733973
"lunardance": {
39743974
"inherit": true,
3975-
"condition": {"duration": 2, "onSwitchInPriority": 1},
3975+
"condition": {"duration": 2},
39763976
"desc": "The user faints and the Pokemon brought out to replace it has its HP and PP fully restored along with having any non-volatile status condition cured. The new Pokemon is sent out at the end of the turn, and the healing happens before hazards take effect. Fails if the user is the last unfainted Pokemon in its party.",
39773977
"shortDesc": "User faints. Replacement is fully healed, with PP."
39783978
},

dex/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pkmn/dex",
3-
"version": "0.9.36",
3+
"version": "0.9.37",
44
"description": "A unification of Pokémon Showdown's client's and server's data layers",
55
"repository": "github:pkmn/ps",
66
"license": "MIT",
@@ -16,7 +16,7 @@
1616
"build"
1717
],
1818
"dependencies": {
19-
"@pkmn/dex-types": "^0.9.36"
19+
"@pkmn/dex-types": "^0.9.37"
2020
},
2121
"scripts": {
2222
"lint": "eslint --cache *.ts",

dex/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pkmn/dex-types",
3-
"version": "0.9.36",
3+
"version": "0.9.37",
44
"types": "index.d.ts",
55
"description": "Common Pokémon Showdown Dex types shared by @pkmn/dex and @pkmn/sim",
66
"repository": "github:pkmn/ps",

integration/build-client

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
604604
if (isNatDex) {
605605
let curItem = item;
606606
let curGen = genNum;
607-
while (item.isNonstandard && curGen >= 7) {
607+
while (curItem.isNonstandard && curGen >= 7) {
608608
curItem = Dex.forGen(curGen).items.get(item.id);
609609
curGen--;
610610
}
@@ -679,6 +679,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
679679
case 'souldew':
680680
// Other
681681
// fallsthrough
682+
case 'leek':
682683
case 'stick':
683684
case 'thickclub':
684685
case 'lightball':

integration/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"@pkmn/client": "file:../client",
77
"@pkmn/data": "file:../data",
8-
"@pkmn/eslint-config": "^9.11.0",
8+
"@pkmn/eslint-config": "^9.12.0",
99
"@pkmn/img": "file:../img",
1010
"@pkmn/protocol": "file:../protocol",
1111
"@pkmn/randoms": "file:../randoms",
@@ -21,7 +21,7 @@
2121
"parcel": "^2.15.4",
2222
"source-map-support": "^0.5.21",
2323
"typescript-eslint": "^8.38.0",
24-
"typescript": "^5.8.3"
24+
"typescript": "^5.9.2"
2525
},
2626
"alias": {
2727
"process": false,

mods/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pkmn/mods",
3-
"version": "0.9.36",
3+
"version": "0.9.37",
44
"description": "Support for non-standard mods to @pkmn/sim and @pkmn/dex",
55
"repository": "github:pkmn/ps",
66
"author": "Guangcong Luo <guangcongluo@gmail.com> (http://guangcongluo.com)",
@@ -121,11 +121,11 @@
121121
"build"
122122
],
123123
"dependencies": {
124-
"@pkmn/dex-types": "^0.9.36"
124+
"@pkmn/dex-types": "^0.9.37"
125125
},
126126
"devDependencies": {
127-
"@pkmn/dex": "^0.9.36",
128-
"@pkmn/sim": "^0.9.36"
127+
"@pkmn/dex": "^0.9.37",
128+
"@pkmn/sim": "^0.9.37"
129129
},
130130
"scripts": {
131131
"lint": "eslint --cache src",

0 commit comments

Comments
 (0)