Import smogon/pokemon-showdown@44a9e287

smogon/pokemon-showdown-client@3d4de887
pkmn · Feb 24, 2025 · 8bc75b1 · 8bc75b1
1 parent 35ffb03
commit 8bc75b1
Show file tree

Hide file tree

Showing 57 changed files with 930 additions and 371 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/client",
-  "version": "0.6.30",
+  "version": "0.6.31",
   "description": "Client battle engine for Pokémon Showdown",
   "repository": "github:pkmn/ps",
   "license": "MIT",
@@ -15,11 +15,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/data": "^0.9.29",
-    "@pkmn/protocol": "^0.6.30"
+    "@pkmn/data": "^0.9.30",
+    "@pkmn/protocol": "^0.6.31"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.29"
+    "@pkmn/dex": "^0.9.30"
   },
   "scripts": {
     "lint": "eslint --cache src",

diff --git a/client/src/field.ts b/client/src/field.ts
@@ -14,7 +14,7 @@ const WEATHERS: {[id: string]: WeatherName} = {
   sunnyday: 'Sun',
   raindance: 'Rain',
   hail: 'Hail',
-  snow: 'Snow',
+  snowscape: 'Snow',
   desolateland: 'Harsh Sunshine',
   primordialsea: 'Heavy Rain',
   deltastream: 'Strong Winds',

diff --git a/data/package.json b/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/data",
-  "version": "0.9.29",
+  "version": "0.9.30",
   "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.29"
+    "@pkmn/dex-types": "^0.9.30"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.29",
-    "@pkmn/mods": "^0.9.29",
-    "@pkmn/sim": "^0.9.29",
+    "@pkmn/dex": "^0.9.30",
+    "@pkmn/mods": "^0.9.30",
+    "@pkmn/sim": "^0.9.30",
     "@smogon/calc": "^0.10.0"
   },
   "scripts": {

diff --git a/dex/data/aliases.json b/dex/data/aliases.json
@@ -201,6 +201,10 @@
   "eiscuen": "Eiscue-Noice",
   "eternalfloette": "Floette-Eternal",
   "eternamax": "Eternatus-Eternamax",
+  "genesectwater": "Genesect-Douse",
+  "genesectelectric": "Genesect-Shock",
+  "genesectfire": "Genesect-Burn",
+  "genesectice": "Genesect-Chill",
   "girao": "Giratina-Origin",
   "giratinao": "Giratina-Origin",
   "gourgeists": "Gourgeist-Small",

diff --git a/dex/data/conditions.json b/dex/data/conditions.json
@@ -186,8 +186,8 @@
       "duration": 5,
       "onFieldResidualOrder": 1
     },
-    "snow": {
-      "name": "Snow",
+    "snowscape": {
+      "name": "Snowscape",
       "effectType": "Weather",
       "duration": 5,
       "onModifyDefPriority": 10,

diff --git a/dex/data/formats-data.json b/dex/data/formats-data.json
@@ -8459,7 +8459,7 @@
       "natDexTier": "RU"
     },
     "sinistea": {"tier": "LC"},
-    "polteageist": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "RU"},
+    "polteageist": {"tier": "UUBL", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "hatenna": {"tier": "LC"},
     "hattrem": {"tier": "NFE"},
     "hatterene": {"tier": "OU", "doublesTier": "DOU", "natDexTier": "OU"},
@@ -8635,7 +8635,7 @@
       "natDexTier": "Uber"
     },
     "slitherwing": {"tier": "RU", "doublesTier": "(DUU)", "natDexTier": "RU"},
-    "roaringmoon": {"tier": "OU", "doublesTier": "DOU", "natDexTier": "(OU)"},
+    "roaringmoon": {"tier": "OU", "doublesTier": "DOU", "natDexTier": "OU"},
     "irontreads": {"tier": "OU", "doublesTier": "(DUU)", "natDexTier": "OU"},
     "ironmoth": {"tier": "OU", "doublesTier": "(DUU)", "natDexTier": "UU"},
     "ironhands": {"tier": "UUBL", "doublesTier": "DOU", "natDexTier": "UUBL"},
@@ -8691,7 +8691,7 @@
       "doublesTier": "DUU",
       "natDexTier": "UUBL"
     },
-    "archaludon": {"tier": "Uber", "doublesTier": "DOU", "natDexTier": "UU"},
+    "archaludon": {"tier": "Uber", "doublesTier": "DUber", "natDexTier": "UU"},
     "hydrapple": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "UU"},
     "gougingfire": {"tier": "Uber", "doublesTier": "DOU", "natDexTier": "Uber"},
     "ragingbolt": {"tier": "OU", "doublesTier": "DOU", "natDexTier": "OU"},
@@ -8779,6 +8779,8 @@
     "scattervein": {"isNonstandard": "CAP", "tier": "CAP NFE"},
     "hemogoblin": {"isNonstandard": "CAP", "tier": "CAP"},
     "cresceidon": {"isNonstandard": "CAP", "tier": "CAP"},
+    "chuggon": {"isNonstandard": "CAP", "tier": "CAP LC"},
+    "draggalong": {"isNonstandard": "CAP", "tier": "CAP NFE"},
     "chuggalong": {"isNonstandard": "CAP", "tier": "CAP"},
     "shox": {"isNonstandard": "CAP", "tier": "CAP"},
     "pokestarsmeargle": {"isNonstandard": "Custom", "tier": "Illegal"},

diff --git a/dex/data/learnsets.json b/dex/data/learnsets.json
@@ -161654,7 +161654,7 @@
         "spiritshackle": ["9L45", "8L45", "7L1"],
         "spite": ["9M", "7T", "7E"],
         "stoneedge": ["9M", "8M", "7M"],
-        "substitute": ["8M", "7M"],
+        "substitute": ["9M", "8M", "7M"],
         "surf": ["9M", "8M", "7M"],
         "swagger": ["7M"],
         "takedown": ["9M"],
@@ -163541,6 +163541,123 @@
         "zenheadbutt": ["9M"]
       }
     },
+    "chuggon": {
+      "learnset": {
+        "acidspray": ["9M"],
+        "bite": ["9L8"],
+        "bodyslam": ["9M"],
+        "bulldoze": ["9M"],
+        "clangingscales": ["9L48"],
+        "crunch": ["9M", "9L32"],
+        "destinybond": ["9E"],
+        "dracometeor": ["9M"],
+        "dragonbreath": ["9L12"],
+        "dragoncheer": ["9M"],
+        "dragonclaw": ["9M"],
+        "dragonpulse": ["9M", "9L36"],
+        "dragonrush": ["9E"],
+        "encore": ["9M"],
+        "endure": ["9M"],
+        "entrainment": ["9E"],
+        "facade": ["9M"],
+        "gunkshot": ["9M", "9L52"],
+        "healbell": ["9E"],
+        "helpinghand": ["9M"],
+        "irondefense": ["9M", "9L44"],
+        "lastresort": ["9E"],
+        "metalsound": ["9M"],
+        "nobleroar": ["9E"],
+        "outrage": ["9M"],
+        "poisongas": ["9L1"],
+        "poisonjab": ["9M"],
+        "poisontail": ["9M"],
+        "protect": ["9M", "9L24"],
+        "raindance": ["9M"],
+        "rest": ["9M"],
+        "roar": ["9M", "9L28"],
+        "rockslide": ["9M"],
+        "rocktomb": ["9M"],
+        "scaleshot": ["9M"],
+        "scaryface": ["9M"],
+        "sleeptalk": ["9M"],
+        "sludge": ["9L20"],
+        "sludgebomb": ["9M", "9L40"],
+        "sludgewave": ["9M"],
+        "smog": ["9L4"],
+        "snarl": ["9M"],
+        "storedpower": ["9M"],
+        "substitute": ["9M"],
+        "sunnyday": ["9M"],
+        "tackle": ["9L1"],
+        "takedown": ["9M"],
+        "taunt": ["9M", "9L16"],
+        "terablast": ["9M"],
+        "toxic": ["9M"],
+        "trailblaze": ["9M"],
+        "uproar": ["9M"],
+        "venoshock": ["9M"]
+      }
+    },
+    "draggalong": {
+      "learnset": {
+        "acidspray": ["9M"],
+        "bite": ["9L1"],
+        "bodyslam": ["9M"],
+        "bulldoze": ["9M"],
+        "clangingscales": ["9L51"],
+        "crunch": ["9M", "9L32"],
+        "destinybond": ["9E"],
+        "dracometeor": ["9M"],
+        "dragonbreath": ["9L12"],
+        "dragoncheer": ["9M"],
+        "dragonclaw": ["9M"],
+        "dragonpulse": ["9M", "9L36"],
+        "dragonrush": ["9E"],
+        "dragontail": ["9M"],
+        "encore": ["9M"],
+        "endure": ["9M"],
+        "entrainment": ["9E"],
+        "facade": ["9M"],
+        "gunkshot": ["9M", "9L56"],
+        "healbell": ["9E"],
+        "helpinghand": ["9M"],
+        "irondefense": ["9M", "9L46"],
+        "ironhead": ["9M"],
+        "lastresort": ["9E"],
+        "metalsound": ["9M"],
+        "nobleroar": ["9E"],
+        "outrage": ["9M"],
+        "poisongas": ["9L1"],
+        "poisonjab": ["9M"],
+        "poisontail": ["9M"],
+        "protect": ["9M", "9L24"],
+        "raindance": ["9M"],
+        "rest": ["9M"],
+        "roar": ["9M", "9L28"],
+        "rockslide": ["9M"],
+        "rocktomb": ["9M"],
+        "scaleshot": ["9M"],
+        "scaryface": ["9M"],
+        "sleeptalk": ["9M"],
+        "sludge": ["9L20"],
+        "sludgebomb": ["9M", "9L41"],
+        "sludgewave": ["9M"],
+        "smog": ["9L1"],
+        "snarl": ["9M"],
+        "stompingtantrum": ["9M"],
+        "storedpower": ["9M"],
+        "substitute": ["9M"],
+        "sunnyday": ["9M"],
+        "tackle": ["9L1"],
+        "takedown": ["9M"],
+        "taunt": ["9M", "9L16"],
+        "terablast": ["9M"],
+        "toxic": ["9M"],
+        "trailblaze": ["9M"],
+        "uproar": ["9M"],
+        "venoshock": ["9M"]
+      }
+    },
     "chuggalong": {
       "learnset": {
         "acidspray": ["9M"],
@@ -163563,6 +163680,7 @@
         "earthquake": ["9M"],
         "encore": ["9M"],
         "endure": ["9M"],
+        "entrainment": ["9E"],
         "facade": ["9M"],
         "flashcannon": ["9M"],
         "gigaimpact": ["9M"],
@@ -163601,8 +163719,9 @@
         "surf": ["9M"],
         "tackle": ["9L1"],
         "takedown": ["9M"],
-        "taunt": ["9M", "9L12"],
+        "taunt": ["9M", "9L16"],
         "terablast": ["9M"],
+        "toxic": ["9M"],
         "trailblaze": ["9M"],
         "uproar": ["9M"],
         "venoshock": ["9M"]
@@ -163620,30 +163739,76 @@
     },
     "shox": {
       "learnset": {
+        "blizzard": ["9M"],
         "bodyslam": ["9M"],
-        "discharge": ["9M"],
-        "doubleedge": ["9M"],
+        "bulldoze": ["9M"],
+        "charge": ["9M", "9L15"],
+        "chargebeam": ["9M"],
+        "charm": ["9M", "9L1"],
+        "dig": ["9M"],
+        "disarmingvoice": ["9M"],
+        "discharge": ["9L44"],
+        "doubleedge": ["9M", "9L58"],
+        "earthpower": ["9M"],
+        "earthquake": ["9M"],
+        "eerieimpulse": ["9M"],
+        "electricterrain": ["9M"],
+        "electroball": ["9M"],
+        "electroweb": ["9M"],
+        "endeavor": ["9M", "9E"],
         "endure": ["9M"],
         "facade": ["9M"],
-        "glare": ["9M"],
+        "gigaimpact": ["9M"],
+        "glare": ["9E"],
+        "growl": ["9L1"],
+        "headbutt": ["9L20"],
         "helpinghand": ["9M"],
+        "highhorsepower": ["9M"],
+        "hornattack": ["9L1"],
+        "hyperbeam": ["9M"],
         "hypervoice": ["9M"],
         "icebeam": ["9M"],
+        "icywind": ["9M"],
+        "ironhead": ["9M"],
         "knockoff": ["9M"],
-        "milkdrink": ["9M"],
-        "nuzzle": ["9M"],
+        "milkdrink": ["9L30"],
+        "mudshot": ["9M"],
+        "mudslap": ["9M"],
+        "nuzzle": ["9E"],
+        "playrough": ["9M"],
         "protect": ["9M"],
+        "raindance": ["9M"],
         "rest": ["9M"],
+        "rockslide": ["9M"],
+        "rocktomb": ["9M"],
+        "scaryface": ["9M", "9L51"],
+        "seedbomb": ["9M"],
         "sleeptalk": ["9M"],
+        "smartstrike": ["9M"],
+        "spark": ["9L25"],
+        "spitup": ["9E"],
+        "stockpile": ["9E"],
+        "stompingtantrum": ["9M"],
         "substitute": ["9M"],
+        "sunnyday": ["9M"],
         "superfang": ["9M"],
-        "takedown": ["9M"],
+        "supercellslam": ["9M"],
+        "swallow": ["9E"],
+        "tackle": ["9L1"],
+        "takedown": ["9M", "9L37"],
         "terablast": ["9M"],
+        "thief": ["9M"],
+        "throatchop": ["9M"],
         "thunder": ["9M"],
-        "thunderwave": ["9M"],
+        "thundershock": ["9L1"],
+        "thunderwave": ["9M", "9L1"],
         "thunderbolt": ["9M"],
+        "trailblaze": ["9M"],
+        "uproar": ["9M"],
         "voltswitch": ["9M"],
-        "wildcharge": ["9M"]
+        "wildcharge": ["9M"],
+        "zapcannon": ["9L65"],
+        "zenheadbutt": ["9M"]
       }
     },
     "pokestarsmeargle": {

diff --git a/dex/data/moves.json b/dex/data/moves.json
@@ -6867,7 +6867,7 @@
       "pp": 10,
       "priority": 0,
       "flags": {},
-      "weather": "snow",
+      "weather": "snowscape",
       "selfSwitch": true,
       "secondary": null,
       "target": "all",
@@ -18626,7 +18626,7 @@
       "pp": 10,
       "priority": 0,
       "flags": {},
-      "weather": "snow",
+      "weather": "snowscape",
       "secondary": null,
       "target": "all",
       "type": "Ice",