Import smogon/pokemon-showdown@8ecd61e5

smogon/pokemon-showdown-client@dd3dc08a

Author: scheibo

client/package.json

@@ -15,11 +15,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/data": "^0.9.28",
+    "@pkmn/data": "^0.9.29",
     "@pkmn/protocol": "^0.6.30"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.28"
+    "@pkmn/dex": "^0.9.29"
   },
   "scripts": {
     "lint": "eslint --cache src",

data/index.test.ts

@@ -274,7 +274,7 @@ for (const [pkg, Dex] of Object.entries(DATA)) {
         expect(gen.species.get('p groudon')!.name).toBe('Groudon-Primal');
         // Rockruff-Dusk
         expect(gen.species.get('Rockruff-Dusk')).toBeDefined();
-        // FIXME expect(Gen(7).species.get('Rockruff-Dusk')!.name).toBe('Rockruff-Dusk');
+        expect(Gen(7).species.get('Rockruff-Dusk')!.name).toBe('Rockruff-Dusk');
       });
 
       it('counts', () => {
@@ -315,7 +315,7 @@ for (const [pkg, Dex] of Object.entries(DATA)) {
         // Alola (18) + Totem (12) + Pikachu (7) - Pikachu (6) + Greninja (2) + Zygarde (2) +
         // Oricorio (3) + Rockruff (1) + Lycanroc (2) + Wishiwashi (1) + Silvally (17) + Minior (1)
         // Mimikyu (1) + Necrozma (3) [Magearna (1) + LGPE Starters/Meltan/Melmetal (4)]
-        formes += 18 + 12 + 7 - 6 + 2 + 2 + 3 + 1 + 2 + 1 + 17 + 1 + 1 + 3 - 1; // FIXME Rockruff
+        formes += 18 + 12 + 7 - 6 + 2 + 2 + 3 + 1 + 2 + 1 + 17 + 1 + 1 + 3;
         expect(counts(7)).toEqual({species: 807, formes});
         // Silvally (17) + Rotom (5) + Basculin (1) + Meowstic (1) +
         // Aegislash (1) + Pumpkaboo (3) + Gourgeist (3) + Pikachu (7) + Galar (14) +
@@ -329,10 +329,10 @@ for (const [pkg, Dex] of Object.entries(DATA)) {
         // {GMax} 26 + 7
         formes = 17 + 5 + 1 + 1 + 1 + 3 + 3 + 7 + 14 + 8 +
           1 + 1 + 1 + 2 + 1 + 2 + 2 + 2 + 1 + 1 + 2 + 2 + 1 +
-          (4 + 1 + 1 + 1 + 1 + 2 + (1 + 1)) + (1 + 3 + 4 + 2 + 3 + 1 + 2) - 1; // FIXME Rockruff
+          (4 + 1 + 1 + 1 + 1 + 2 + (1 + 1)) + (1 + 3 + 4 + 2 + 3 + 1 + 2);
         expect(counts(8)).toEqual({species: 664, formes});
         // Galar (1) + Paldea (4) + Rotom (5) + Basculin (1) + Vivillon-Fancy (1) + Oricorio (3) +
-        // Lycanroc (2) + Mimikyu (1) + Toxtricity (1) + Eiscue (1) + Indeedee (1) +
+        // Rockruff (1) + Lycanroc (2) + Mimikyu (1) + Toxtricity (1) + Eiscue (1) + Indeedee (1) +
         // Oinkologne (1) + Dudunsparce (1) + Palafin (1) + Maushold (1) + Squawkabilly (3) +
         // *-Antique (2) + Hisui (2)
         // {HOME} Pikachu (8) + *-Origin (3) + *-Therian (4) + Alola (7) + Galar (6) + Hisui (14) +
@@ -343,7 +343,7 @@ for (const [pkg, Dex] of Object.entries(DATA)) {
         // *-Masterpiece (2) + Ogerpon (7)
         // {DLC2} Alola(1) + Deoxys (3) + Keldeo (1) + Kyurem (2) + Meowstic (1) + Minior (1) +
         // Necrozma (2) + Terapagos (2)
-        formes = 1 + 4 + 5 + 1 + 1 + 3 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 3 + 2 + 2 +
+        formes = 1 + 4 + 5 + 1 + 1 + 3 + 1 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 3 + 2 + 2 +
           (8 + 3 + 4 + 7 + 6 + 14 + 17 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 1 + 2 + 1 + 1) +
           (8 + 1 + 2 + 1 + 1 + 2 + 7) + (1 + 3 + 1 + 2 + 1 + 1 + 2 + 2);
         // Charizard (3) + Cinderace (3) + Greninja (3) + Vivillon (1) + Walking Wake (1) +

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/data",
-  "version": "0.9.28",
+  "version": "0.9.29",
   "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.9.28"
+    "@pkmn/dex-types": "^0.9.29"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.28",
-    "@pkmn/mods": "^0.9.28",
-    "@pkmn/sim": "^0.9.28",
+    "@pkmn/dex": "^0.9.29",
+    "@pkmn/mods": "^0.9.29",
+    "@pkmn/sim": "^0.9.29",
     "@smogon/calc": "^0.10.0"
   },
   "scripts": {

dex/data/abilities.json

@@ -408,6 +408,10 @@
       "desc": "Prevents other Pokemon from lowering this Pokemon's accuracy stat stage.",
       "shortDesc": "Prevents other Pokemon from lowering this Pokemon's accuracy stat stage."
     },
+    "magicbounce": {
+      "inherit": true,
+      "desc": "This Pokemon is unaffected by certain non-damaging moves directed at it and will instead use such moves against the original user. Moves reflected in this way are unable to be reflected again by this or Magic Coat's effect. Spikes, Stealth Rock, and Toxic Spikes can only be reflected once per side, by the leftmost Pokemon under this or Magic Coat's effect. The Lightning Rod and Storm Drain Abilities redirect their respective moves before this Ability takes effect."
+    },
     "oblivious": {
       "inherit": true,
       "desc": "This Pokemon cannot be infatuated. Gaining this Ability while infatuated cures it.",
@@ -433,10 +437,6 @@
       "inherit": true,
       "desc": "This Pokemon is immune to Ground-type attacks and the effects of Spikes, Toxic Spikes, and the Arena Trap Ability. The effects of Gravity, Ingrain, Smack Down, and Iron Ball nullify the immunity."
     },
-    "magicbounce": {
-      "inherit": true,
-      "desc": "This Pokemon is unaffected by certain non-damaging moves directed at it and will instead use such moves against the original user. Moves reflected in this way are unable to be reflected again by this or Magic Coat's effect. Spikes, Stealth Rock, and Toxic Spikes can only be reflected once per side, by the leftmost Pokemon under this or Magic Coat's effect. The Lightning Rod and Storm Drain Abilities redirect their respective moves before this Ability takes effect."
-    },
     "magnetpull": {
       "inherit": true,
       "desc": "Prevents adjacent opposing Steel-type Pokemon from choosing to switch out, unless they are holding a Shed Shell.",

dex/data/aliases.json

@@ -446,7 +446,6 @@
   "ogerponteal": "Ogerpon",
   "ogerpontealmask": "Ogerpon",
   "terapagosbaby": "Terapagos",
-  "rockruffdusk": "Rockruff",
   "raticatet": "Raticate-Alola-Totem",
   "totemalolanraticate": "Raticate-Alola-Totem",
   "totemraticate": "Raticate-Alola-Totem",

dex/data/formats-data.json

@@ -423,7 +423,7 @@
     "kakuna": {"tier": "NFE"},
     "beedrill": {"tier": "ZU"},
     "pidgey": {"tier": "LC"},
-    "pidgeotto": {"tier": "ZU"},
+    "pidgeotto": {"tier": "NFE"},
     "pidgeot": {"tier": "NU"},
     "rattata": {"tier": "LC"},
     "raticate": {"tier": "NU"},
@@ -440,7 +440,7 @@
     "nidorina": {"tier": "NFE"},
     "nidoqueen": {"tier": "UU"},
     "nidoranm": {"tier": "LC"},
-    "nidorino": {"tier": "ZU"},
+    "nidorino": {"tier": "NFE"},
     "nidoking": {"tier": "UU"},
     "cleffa": {"tier": "LC"},
     "clefairy": {"tier": "NFE"},
@@ -469,7 +469,7 @@
     "golduck": {"tier": "UU"},
     "mankey": {"tier": "LC"},
     "primeape": {"tier": "RU"},
-    "growlithe": {"tier": "ZU"},
+    "growlithe": {"tier": "LC"},
     "arcanine": {"tier": "UU"},
     "poliwag": {"tier": "LC"},
     "poliwhirl": {"tier": "ZUBL"},
@@ -508,7 +508,7 @@
     "gastly": {"tier": "PU"},
     "haunter": {"tier": "NU"},
     "gengar": {"tier": "OU"},
-    "onix": {"tier": "ZU"},
+    "onix": {"tier": "LC"},
     "steelix": {"tier": "UUBL"},
     "drowzee": {"tier": "ZU"},
     "hypno": {"tier": "UU"},
@@ -533,17 +533,17 @@
     "blissey": {"tier": "OU"},
     "tangela": {"tier": "PU"},
     "kangaskhan": {"tier": "UU"},
-    "horsea": {"tier": "ZU"},
+    "horsea": {"tier": "LC"},
     "seadra": {"tier": "PU"},
     "kingdra": {"tier": "UUBL"},
     "goldeen": {"tier": "LC"},
     "seaking": {"tier": "ZU"},
-    "staryu": {"tier": "ZU"},
+    "staryu": {"tier": "LC"},
     "starmie": {"tier": "OU"},
     "mrmime": {"tier": "RU"},
     "scyther": {"tier": "UU"},
     "scizor": {"tier": "UUBL"},
-    "smoochum": {"tier": "ZU"},
+    "smoochum": {"tier": "LC"},
     "jynx": {"tier": "UUBL"},
     "elekid": {"tier": "ZU"},
     "electabuzz": {"tier": "UU"},
@@ -580,7 +580,7 @@
     "chikorita": {"tier": "LC"},
     "bayleef": {"tier": "NFE"},
     "meganium": {"tier": "RU"},
-    "cyndaquil": {"tier": "ZU"},
+    "cyndaquil": {"tier": "LC"},
     "quilava": {"tier": "ZU"},
     "typhlosion": {"tier": "UUBL"},
     "totodile": {"tier": "LC"},
@@ -679,12 +679,12 @@
     "cascoon": {"tier": "NFE"},
     "dustox": {"tier": "ZU"},
     "lotad": {"tier": "LC"},
-    "lombre": {"tier": "ZU"},
+    "lombre": {"tier": "NFE"},
     "ludicolo": {"tier": "UUBL"},
     "seedot": {"tier": "LC"},
     "nuzleaf": {"tier": "NFE"},
     "shiftry": {"tier": "RU"},
-    "taillow": {"tier": "ZU"},
+    "taillow": {"tier": "LC"},
     "swellow": {"tier": "UUBL"},
     "wingull": {"tier": "LC"},
     "pelipper": {"tier": "NU"},
@@ -727,7 +727,7 @@
     "swalot": {"tier": "PU"},
     "carvanha": {"tier": "LC"},
     "sharpedo": {"tier": "RU"},
-    "wailmer": {"tier": "ZU"},
+    "wailmer": {"tier": "LC"},
     "wailord": {"tier": "NU"},
     "numel": {"tier": "LC"},
     "camerupt": {"tier": "RU"},
@@ -770,7 +770,7 @@
     "tropius": {"tier": "ZU"},
     "chimecho": {"tier": "NU"},
     "absol": {"tier": "RU"},
-    "snorunt": {"tier": "ZU"},
+    "snorunt": {"tier": "LC"},
     "glalie": {"tier": "NU"},
     "spheal": {"tier": "LC"},
     "sealeo": {"tier": "PU"},
@@ -8590,7 +8590,7 @@
     "tandemaus": {"tier": "LC"},
     "maushold": {"tier": "RU", "doublesTier": "DUU", "natDexTier": "RU"},
     "cetoddle": {"tier": "LC"},
-    "cetitan": {"tier": "PUBL", "doublesTier": "(DUU)", "natDexTier": "RU"},
+    "cetitan": {"tier": "NUBL", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "frigibax": {"tier": "LC"},
     "arctibax": {"tier": "NFE"},
     "baxcalibur": {