Skip to content

Commit d9bc698

Browse files
scheiboscheibo
committed
smogon/pokemon-showdown-client@f4baa241
1 parent 9acfff8 commit d9bc698

38 files changed

+472
-131
lines changed

‎client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"build"
1616
],
1717
"dependencies": {
18-
"@pkmn/data": "^0.9.24",
18+
"@pkmn/data": "^0.9.25",
1919
"@pkmn/protocol": "^0.6.30"
2020
},
2121
"devDependencies": {
22-
"@pkmn/dex": "^0.9.24"
22+
"@pkmn/dex": "^0.9.25"
2323
},
2424
"scripts": {
2525
"lint": "eslint --cache src",

‎data/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pkmn/data",
3-
"version": "0.9.24",
3+
"version": "0.9.25",
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.24"
19+
"@pkmn/dex-types": "^0.9.25"
2020
},
2121
"devDependencies": {
22-
"@pkmn/dex": "^0.9.24",
23-
"@pkmn/mods": "^0.9.24",
24-
"@pkmn/sim": "^0.9.24",
22+
"@pkmn/dex": "^0.9.25",
23+
"@pkmn/mods": "^0.9.25",
24+
"@pkmn/sim": "^0.9.25",
2525
"@smogon/calc": "^0.10.0"
2626
},
2727
"scripts": {

‎dex/data/abilities.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3413,8 +3413,8 @@
34133413
"flags": {},
34143414
"name": "Toxic Chain",
34153415
"num": 305,
3416-
"desc": "This Pokemon's moves have a 30% chance of badly poisoning. This effect comes after a move's inherent secondary effect chance.",
3417-
"shortDesc": "This Pokemon's moves have a 30% chance of badly poisoning."
3416+
"desc": "This Pokemon's attacks have a 30% chance of badly poisoning. This effect comes before a move's inherent secondary effect chance.",
3417+
"shortDesc": "This Pokemon's attacks have a 30% chance of badly poisoning."
34183418
},
34193419
"toxicdebris": {
34203420
"flags": {},

‎dex/data/formats-data.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -7313,7 +7313,7 @@
73137313
"doublesTier": "(DUU)",
73147314
"natDexTier": "RUBL"
73157315
},
7316-
"deoxysspeed": {"tier": "OU", "doublesTier": "(DUU)", "natDexTier": "Uber"},
7316+
"deoxysspeed": {"tier": "OU", "doublesTier": "(DUU)", "natDexTier": "(OU)"},
73177317
"turtwig": {"tier": "LC"},
73187318
"grotle": {"tier": "NFE"},
73197319
"torterra": {"tier": "NU", "doublesTier": "(DUU)", "natDexTier": "RU"},
@@ -8784,6 +8784,7 @@
87848784
"hemogoblin": {"isNonstandard": "CAP", "tier": "CAP"},
87858785
"cresceidon": {"isNonstandard": "CAP", "tier": "CAP"},
87868786
"chuggalong": {"isNonstandard": "CAP", "tier": "CAP"},
8787+
"shox": {"isNonstandard": "CAP", "tier": "CAP"},
87878788
"pokestarsmeargle": {"isNonstandard": "Custom", "tier": "Illegal"},
87888789
"pokestarufo": {"isNonstandard": "Custom", "tier": "Illegal"},
87898790
"pokestarufo2": {"isNonstandard": "Custom", "tier": "Illegal"},

‎dex/data/items.json

+18-1
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,17 @@
287287
"custapberry": {"inherit": true},
288288
"deepseascale": {"inherit": true},
289289
"deepseatooth": {"inherit": true},
290+
"dracoplate": {"inherit": true, "onTakeItem": true},
291+
"dreadplate": {"inherit": true, "onTakeItem": true},
292+
"earthplate": {"inherit": true, "onTakeItem": true},
290293
"fastball": {"inherit": true, "isNonstandard": null},
294+
"fistplate": {"inherit": true, "onTakeItem": true},
291295
"flameorb": {
292296
"inherit": true,
293297
"onResidualOrder": 10,
294298
"onResidualSubOrder": 20
295299
},
300+
"flameplate": {"inherit": true, "onTakeItem": true},
296301
"focussash": {
297302
"inherit": true,
298303
"condition": {"duration": 1},
@@ -303,10 +308,13 @@
303308
"shortDesc": "Can only be held by Giratina. Its Ghost- & Dragon-type attacks have 1.2x power."
304309
},
305310
"heavyball": {"inherit": true, "isNonstandard": null},
311+
"icicleplate": {"inherit": true, "onTakeItem": true},
312+
"insectplate": {"inherit": true, "onTakeItem": true},
306313
"ironball": {
307314
"inherit": true,
308315
"shortDesc": "Holder's Speed is halved and it becomes grounded."
309316
},
317+
"ironplate": {"inherit": true, "onTakeItem": true},
310318
"kingsrock": {"inherit": true},
311319
"laxincense": {"inherit": true, "onModifyAccuracyPriority": 5},
312320
"leftovers": {
@@ -324,6 +332,7 @@
324332
"luckypunch": {"inherit": true},
325333
"lureball": {"inherit": true, "isNonstandard": null},
326334
"lustrousorb": {"inherit": true},
335+
"meadowplate": {"inherit": true, "onTakeItem": true},
327336
"mentalherb": {
328337
"inherit": true,
329338
"fling": {"basePower": 10},
@@ -338,22 +347,29 @@
338347
"inherit": true,
339348
"condition": {"duration": 2, "onSourceModifyAccuracyPriority": 3}
340349
},
350+
"mindplate": {"inherit": true, "onTakeItem": true},
341351
"moonball": {"inherit": true, "isNonstandard": null},
342352
"razorfang": {"inherit": true},
353+
"skyplate": {"inherit": true, "onTakeItem": true},
354+
"splashplate": {"inherit": true, "onTakeItem": true},
355+
"spookyplate": {"inherit": true, "onTakeItem": true},
343356
"sportball": {"inherit": true, "isNonstandard": null},
344357
"stick": {"inherit": true},
345358
"stickybarb": {
346359
"inherit": true,
347360
"onResidualOrder": 10,
348361
"onResidualSubOrder": 20
349362
},
363+
"stoneplate": {"inherit": true, "onTakeItem": true},
350364
"thickclub": {"inherit": true},
351365
"toxicorb": {
352366
"inherit": true,
353367
"onResidualOrder": 10,
354368
"onResidualSubOrder": 20
355369
},
370+
"toxicplate": {"inherit": true, "onTakeItem": true},
356371
"widelens": {"inherit": true, "onSourceModifyAccuracyPriority": 4},
372+
"zapplate": {"inherit": true, "onTakeItem": true},
357373
"zoomlens": {"inherit": true, "onSourceModifyAccuracyPriority": 4}
358374
},
359375
"5": {
@@ -1153,7 +1169,7 @@
11531169
"ignoreKlutz": true,
11541170
"num": 1881,
11551171
"gen": 9,
1156-
"shortDesc": "Holder's Ability cannot be changed by any effect."
1172+
"shortDesc": "Holder's Ability cannot be changed, suppressed, or ignored by any effect."
11571173
},
11581174
"abomasite": {
11591175
"name": "Abomasite",
@@ -2994,6 +3010,7 @@
29943010
"fling": {"basePower": 30},
29953011
"num": 1886,
29963012
"gen": 9,
3013+
"desc": "The holder's moves that normally hit 2 to 5 times instead hit 4 or 5 times. If the first hit is successful, the holder's use of Triple Kick or Triple Axel hits 3 times, and Population Bomb hits 4 to 10 times, at random.",
29973014
"shortDesc": "Holder's moves that hit 2-5 times hit 4-5 times; Population Bomb hits 4-10 times."
29983015
},
29993016
"lopunnite": {

‎dex/data/learnsets.json

+28-1
Original file line numberDiff line numberDiff line change
@@ -163283,7 +163283,6 @@
163283163283
"encore": ["9M"],
163284163284
"endure": ["9M"],
163285163285
"facade": ["9M"],
163286-
"flamethrower": ["9M"],
163287163286
"flashcannon": ["9M"],
163288163287
"gigaimpact": ["9M"],
163289163288
"gunkshot": ["9M", "9L58"],
@@ -163338,6 +163337,34 @@
163338163337
}
163339163338
]
163340163339
},
163340+
"shox": {
163341+
"learnset": {
163342+
"bodyslam": ["9M"],
163343+
"discharge": ["9M"],
163344+
"doubleedge": ["9M"],
163345+
"endure": ["9M"],
163346+
"facade": ["9M"],
163347+
"glare": ["9M"],
163348+
"helpinghand": ["9M"],
163349+
"hypervoice": ["9M"],
163350+
"icebeam": ["9M"],
163351+
"knockoff": ["9M"],
163352+
"milkdrink": ["9M"],
163353+
"nuzzle": ["9M"],
163354+
"protect": ["9M"],
163355+
"rest": ["9M"],
163356+
"sleeptalk": ["9M"],
163357+
"substitute": ["9M"],
163358+
"superfang": ["9M"],
163359+
"takedown": ["9M"],
163360+
"terablast": ["9M"],
163361+
"thunder": ["9M"],
163362+
"thunderwave": ["9M"],
163363+
"thunderbolt": ["9M"],
163364+
"voltswitch": ["9M"],
163365+
"wildcharge": ["9M"]
163366+
}
163367+
},
163341163368
"pokestarsmeargle": {
163342163369
"eventData": [
163343163370
{

0 commit comments

Comments
 (0)