Import smogon/pokemon-showdown@58f2588b

smogon/pokemon-showdown-client@b6a0f088
pkmn · Dec 13, 2023 · b7b140a · b7b140a
1 parent 415eb34
commit b7b140a
Show file tree

Hide file tree

Showing 34 changed files with 703 additions and 687 deletions.
diff --git a/client/package.json b/client/package.json
@@ -15,11 +15,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/data": "^0.7.59",
+    "@pkmn/data": "^0.8.0",
     "@pkmn/protocol": "^0.6.16"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.7.59"
+    "@pkmn/dex": "^0.8.0"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts",

diff --git a/data/index.test.ts b/data/index.test.ts
@@ -386,7 +386,7 @@ for (const [pkg, Dex] of Object.entries(DATA)) {
         expect(Gen(3).species.get('Clefable')!.abilities).toEqual({'0': 'Cute Charm'});
         expect(Gen(8).species.get('Clefable')!.abilities)
           .toEqual({'0': 'Cute Charm', '1': 'Magic Guard', H: 'Unaware'});
-        expect(Gen(5).species.get('Milotic')!.abilities).toEqual({'0': 'Marvel Scale'});
+        expect(Gen(4).species.get('Milotic')!.abilities).toEqual({'0': 'Marvel Scale'});
         expect(Gen(6).species.get('Milotic')!.abilities)
           .toEqual({'0': 'Marvel Scale', '1': 'Competitive', H: 'Cute Charm'});
         expect(Gen(2).species.get('Snorlax')!.tier).toBe('OU');

diff --git a/data/package.json b/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/data",
-  "version": "0.7.59",
+  "version": "0.8.0",
   "description": "A forked implementation of the Pokémon Showdown client's data layer",
   "repository": "github:pkmn/ps",
   "license": "MIT",
@@ -16,12 +16,12 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/dex-types": "^0.7.59"
+    "@pkmn/dex-types": "^0.8.0"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.7.59",
-    "@pkmn/mods": "^0.7.59",
-    "@pkmn/sim": "^0.7.59",
+    "@pkmn/dex": "^0.8.0",
+    "@pkmn/mods": "^0.8.0",
+    "@pkmn/sim": "^0.8.0",
     "@smogon/calc": "^0.8.1"
   },
   "scripts": {

diff --git a/dex/data/formats-data.json b/dex/data/formats-data.json
@@ -5345,7 +5345,7 @@
     "cleffa": {"tier": "LC"},
     "clefairy": {"tier": "NFE", "doublesTier": "DUU"},
     "clefable": {"tier": "OU", "doublesTier": "(DUU)"},
-    "vulpix": {"tier": "NUBL", "doublesTier": "NFE"},
+    "vulpix": {"tier": "NFE"},
     "vulpixalola": {"tier": "NFE"},
     "ninetales": {"tier": "NU", "doublesTier": "DUU"},
     "ninetalesalola": {"tier": "UU", "doublesTier": "DOU"},
@@ -5362,7 +5362,7 @@
     "paras": {"isNonstandard": "Past", "tier": "Illegal"},
     "parasect": {"isNonstandard": "Past", "tier": "Illegal"},
     "venonat": {"tier": "LC"},
-    "venomoth": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "venomoth": {"tier": "NU", "doublesTier": "(DUU)"},
     "diglett": {"tier": "NFE"},
     "diglettalola": {"tier": "LC"},
     "dugtrio": {"tier": "ZU", "doublesTier": "(DUU)"},
@@ -5373,7 +5373,7 @@
     "meowthgmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "persian": {"tier": "ZU", "doublesTier": "(DUU)"},
     "persianalola": {"tier": "PU", "doublesTier": "(DUU)"},
-    "perrserker": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "perrserker": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "psyduck": {"tier": "LC"},
     "golduck": {"tier": "ZU", "doublesTier": "(DUU)"},
     "mankey": {"tier": "LC"},
@@ -5447,7 +5447,7 @@
     "kinglergmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "voltorb": {"tier": "LC"},
     "voltorbhisui": {"tier": "LC"},
-    "electrode": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "electrode": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "electrodehisui": {"tier": "NU", "doublesTier": "(DUU)"},
     "exeggcute": {"isNonstandard": "Past", "tier": "Illegal"},
     "exeggutor": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -5500,7 +5500,7 @@
     "magmortar": {"isNonstandard": "Past", "tier": "Illegal"},
     "pinsir": {"isNonstandard": "Past", "tier": "Illegal"},
     "pinsirmega": {"isNonstandard": "Past", "tier": "Illegal"},
-    "tauros": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "tauros": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "taurospaldeacombat": {"tier": "PU", "doublesTier": "(DUU)"},
     "taurospaldeablaze": {"tier": "NU", "doublesTier": "(DUU)"},
     "taurospaldeaaqua": {"tier": "NU", "doublesTier": "(DUU)"},
@@ -5531,7 +5531,7 @@
     "aerodactyl": {"isNonstandard": "Past", "tier": "Illegal"},
     "aerodactylmega": {"isNonstandard": "Past", "tier": "Illegal"},
     "munchlax": {"tier": "LC"},
-    "snorlax": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "snorlax": {"tier": "NU", "doublesTier": "(DUU)"},
     "snorlaxgmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "articuno": {"tier": "PU", "doublesTier": "(DUU)"},
     "articunogalar": {"tier": "NU", "doublesTier": "(DUU)"},
@@ -5620,7 +5620,7 @@
     "weavile": {"tier": "UU", "doublesTier": "(DUU)"},
     "sneasler": {"tier": "Uber", "doublesTier": "(DUU)"},
     "teddiursa": {"tier": "LC"},
-    "ursaring": {"tier": "ZU", "doublesTier": "NFE"},
+    "ursaring": {"tier": "ZUBL", "doublesTier": "NFE"},
     "ursaluna": {"tier": "UU", "doublesTier": "DOU"},
     "ursalunabloodmoon": {"tier": "Uber", "doublesTier": "DOU"},
     "slugma": {"tier": "LC"},
@@ -5643,7 +5643,7 @@
     "phanpy": {"tier": "LC"},
     "donphan": {"tier": "RU", "doublesTier": "(DUU)"},
     "stantler": {"tier": "NFE"},
-    "wyrdeer": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "wyrdeer": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "smeargle": {"isNonstandard": "Past", "tier": "Illegal"},
     "miltank": {"isNonstandard": "Past", "tier": "Illegal"},
     "raikou": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -5697,7 +5697,7 @@
     "gallade": {"tier": "NU", "doublesTier": "(DUU)"},
     "gallademega": {"isNonstandard": "Past", "tier": "Illegal"},
     "surskit": {"tier": "LC"},
-    "masquerain": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "masquerain": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "shroomish": {"tier": "LC"},
     "breloom": {"tier": "UU", "doublesTier": "(DUU)"},
     "slakoth": {"tier": "LC"},
@@ -5901,11 +5901,11 @@
     "rotom": {"tier": "PU", "doublesTier": "(DUU)"},
     "rotomheat": {"tier": "RU", "doublesTier": "(DUU)"},
     "rotomwash": {"tier": "UU", "doublesTier": "(DUU)"},
-    "rotomfrost": {"tier": "ZU", "doublesTier": "(DUU)"},
-    "rotomfan": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "rotomfrost": {"tier": "ZUBL", "doublesTier": "(DUU)"},
+    "rotomfan": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "rotommow": {"tier": "NU", "doublesTier": "(DUU)"},
     "uxie": {"tier": "NU", "doublesTier": "(DUU)"},
-    "mesprit": {"tier": "PU", "doublesTier": "(DUU)"},
+    "mesprit": {"tier": "PUBL", "doublesTier": "(DUU)"},
     "azelf": {"tier": "RU", "doublesTier": "(DUU)"},
     "dialga": {"tier": "Uber", "doublesTier": "DUber"},
     "dialgaorigin": {"tier": "Uber", "doublesTier": "DUber"},
@@ -6012,7 +6012,7 @@
     "garbodorgmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "zorua": {"tier": "LC"},
     "zoruahisui": {"tier": "LC"},
-    "zoroark": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "zoroark": {"tier": "NU", "doublesTier": "(DUU)"},
     "zoroarkhisui": {"tier": "RU", "doublesTier": "(DUU)"},
     "minccino": {"isNonstandard": "Past", "tier": "Illegal"},
     "cinccino": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -6085,7 +6085,7 @@
     "cobalion": {"isNonstandard": "Past", "tier": "Illegal"},
     "terrakion": {"isNonstandard": "Past", "tier": "Illegal"},
     "virizion": {"isNonstandard": "Past", "tier": "Illegal"},
-    "tornadus": {"tier": "NUBL", "doublesTier": "DOU"},
+    "tornadus": {"tier": "NU", "doublesTier": "DOU"},
     "tornadustherian": {"tier": "UU", "doublesTier": "(DUU)"},
     "thundurus": {"tier": "RU", "doublesTier": "DUU"},
     "thundurustherian": {"tier": "UU", "doublesTier": "(DUU)"},
@@ -6098,7 +6098,7 @@
     "kyuremwhite": {"isNonstandard": "Past", "tier": "Illegal"},
     "keldeo": {"isNonstandard": "Past", "tier": "Illegal"},
     "keldeoresolute": {"isNonstandard": "Past"},
-    "meloetta": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "meloetta": {"tier": "NU", "doublesTier": "(DUU)"},
     "genesect": {"isNonstandard": "Past", "tier": "Illegal"},
     "genesectburn": {"isNonstandard": "Past", "tier": "Illegal"},
     "genesectchill": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -6109,7 +6109,7 @@
     "chesnaught": {"tier": "RU", "doublesTier": "(DUU)"},
     "fennekin": {"tier": "LC"},
     "braixen": {"tier": "NFE"},
-    "delphox": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "delphox": {"tier": "NU", "doublesTier": "(DUU)"},
     "froakie": {"tier": "LC"},
     "frogadier": {"tier": "ZU", "doublesTier": "NFE"},
     "greninja": {"tier": "OU", "doublesTier": "(DUU)"},
@@ -6215,10 +6215,10 @@
     "vikavolttotem": {"isNonstandard": "Past", "tier": "Illegal"},
     "crabrawler": {"tier": "LC"},
     "crabominable": {"tier": "ZUBL", "doublesTier": "(DUU)"},
-    "oricorio": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "oricorio": {"tier": "NU", "doublesTier": "(DUU)"},
     "oricoriopompom": {"tier": "NUBL", "doublesTier": "(DUU)"},
     "oricoriopau": {"tier": "PUBL", "doublesTier": "(DUU)"},
-    "oricoriosensu": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "oricoriosensu": {"tier": "NU", "doublesTier": "(DUU)"},
     "cutiefly": {"tier": "NFE"},
     "ribombee": {"tier": "OU", "doublesTier": "(DUU)"},
     "ribombeetotem": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -6331,7 +6331,7 @@
     "cinderacegmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "sobble": {"tier": "LC"},
     "drizzile": {"tier": "NFE"},
-    "inteleon": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "inteleon": {"tier": "NU", "doublesTier": "(DUU)"},
     "inteleongmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "skwovet": {"tier": "LC"},
     "greedent": {"tier": "ZU", "doublesTier": "(DUU)"},
@@ -6371,7 +6371,7 @@
     "arrokuda": {"tier": "LC"},
     "barraskewda": {"tier": "UU", "doublesTier": "(DUU)"},
     "toxel": {"tier": "LC"},
-    "toxtricity": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "toxtricity": {"tier": "NU", "doublesTier": "(DUU)"},
     "toxtricitygmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "toxtricitylowkeygmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "sizzlipede": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -6395,7 +6395,7 @@
     "falinks": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "pincurchin": {"tier": "ZU", "doublesTier": "(DUU)"},
     "snom": {"tier": "LC"},
-    "frosmoth": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "frosmoth": {"tier": "NU", "doublesTier": "(DUU)"},
     "stonjourner": {"tier": "ZU", "doublesTier": "(DUU)"},
     "eiscue": {"tier": "ZU", "doublesTier": "(DUU)"},
     "indeedee": {"tier": "PU", "doublesTier": "(DUU)"},
@@ -6488,7 +6488,7 @@
     "kilowattrel": {"tier": "RU", "doublesTier": "(DUU)"},
     "bombirdier": {"tier": "PU", "doublesTier": "(DUU)"},
     "squawkabilly": {"tier": "ZU", "doublesTier": "(DUU)"},
-    "flamigo": {"tier": "NUBL", "doublesTier": "(DUU)"},
+    "flamigo": {"tier": "NU", "doublesTier": "(DUU)"},
     "klawf": {"tier": "ZU", "doublesTier": "(DUU)"},
     "nacli": {"tier": "LC"},
     "naclstack": {"tier": "PU", "doublesTier": "NFE"},
@@ -6500,22 +6500,22 @@
     "fidough": {"tier": "LC"},
     "dachsbun": {"tier": "ZU", "doublesTier": "(DUU)"},
     "maschiff": {"tier": "LC"},
-    "mabosstiff": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "mabosstiff": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "bramblin": {"tier": "LC"},
     "brambleghast": {"tier": "RU", "doublesTier": "(DUU)"},
     "gimmighoul": {"tier": "LC"},
     "gimmighoulroaming": {"tier": "LC"},
     "gholdengo": {"tier": "OU", "doublesTier": "DOU"},
     "greattusk": {"tier": "OU", "doublesTier": "DUU"},
-    "brutebonnet": {"tier": "NUBL", "doublesTier": "DUU"},
+    "brutebonnet": {"tier": "NU", "doublesTier": "DUU"},
     "sandyshocks": {"tier": "UU", "doublesTier": "(DUU)"},
     "screamtail": {"tier": "NU", "doublesTier": "(DUU)"},
     "fluttermane": {"tier": "Uber", "doublesTier": "DOU"},
     "slitherwing": {"tier": "RU", "doublesTier": "(DUU)"},
     "roaringmoon": {"tier": "Uber", "doublesTier": "DOU"},
     "irontreads": {"tier": "UU", "doublesTier": "(DUU)"},
     "ironmoth": {"tier": "OU", "doublesTier": "DUU"},
-    "ironhands": {"tier": "UU", "doublesTier": "DOU"},
+    "ironhands": {"tier": "UUBL", "doublesTier": "DOU"},
     "ironjugulis": {"tier": "RU", "doublesTier": "(DUU)"},
     "ironthorns": {"tier": "RU", "doublesTier": "(DUU)"},
     "ironbundle": {"tier": "Uber", "doublesTier": "DOU"},