Import smogon/pokemon-showdown@453530d4

smogon/pokemon-showdown-client@12217562
pkmn · Nov 4, 2024 · 45d2a3c · 45d2a3c
1 parent aa8119f
commit 45d2a3c
Show file tree

Hide file tree

Showing 47 changed files with 316 additions and 231 deletions.
diff --git a/client/package.json b/client/package.json
@@ -15,11 +15,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/data": "^0.9.21",
+    "@pkmn/data": "^0.9.22",
     "@pkmn/protocol": "^0.6.28"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.21"
+    "@pkmn/dex": "^0.9.22"
   },
   "scripts": {
     "lint": "eslint --cache src",

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

diff --git a/dex/data/aliases.json b/dex/data/aliases.json
@@ -45,6 +45,7 @@
   "bh": "[Gen 9] Balanced Hackmons",
   "mnm": "[Gen 9] Mix and Mega",
   "aaa": "[Gen 9] Almost Any Ability",
+  "aaauu": "[Gen 9] Almost Any Ability UU",
   "stab": "[Gen 9] STABmons",
   "gg": "[Gen 9] Godly Gift",
   "pic": "[Gen 9] Partners in Crime",
@@ -88,8 +89,8 @@
   "gen6ag": "[Gen 6] Anything Goes",
   "crossevo": "[Gen 9] Cross Evolution",
   "mayhem": "[Gen 9] Random Battle Mayhem",
-  "omotm": "[Gen 9] Convergence",
-  "lcotm": "[Gen 9] Inverse",
+  "omotm": "[Gen 9] Passive Aggressive",
+  "lcotm": "[Gen 9] Almost Any Ability UU",
   "fabio": "Ampharos-Mega",
   "maero": "Aerodactyl-Mega",
   "megabunny": "Lopunny-Mega",

diff --git a/dex/data/formats-data.json b/dex/data/formats-data.json
@@ -6583,7 +6583,7 @@
     "shellder": {"tier": "LC"},
     "cloyster": {"tier": "NUBL", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "gastly": {"tier": "NFE"},
-    "haunter": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "haunter": {"tier": "NFE"},
     "gengar": {"tier": "RU", "doublesTier": "(DUU)", "natDexTier": "RUBL"},
     "gengarmega": {
       "isNonstandard": "Past",
@@ -6644,7 +6644,7 @@
     "weezing": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "weezinggalar": {"tier": "RU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "rhyhorn": {"tier": "LC"},
-    "rhydon": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "rhydon": {"tier": "NFE"},
     "rhyperior": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "happiny": {"tier": "LC"},
     "chansey": {"tier": "RU", "doublesTier": "NFE", "natDexTier": "UU"},
@@ -6748,7 +6748,7 @@
     "glaceon": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "sylveon": {"tier": "NU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "porygon": {"tier": "NFE"},
-    "porygon2": {"tier": "ZU", "doublesTier": "DUU", "natDexTier": "NFE"},
+    "porygon2": {"tier": "NFE", "doublesTier": "DUU", "natDexTier": "NFE"},
     "porygonz": {"tier": "NU", "doublesTier": "(DUU)", "natDexTier": "RUBL"},
     "omanyte": {"isNonstandard": "Past", "tier": "Illegal", "natDexTier": "LC"},
     "omastar": {"isNonstandard": "Past", "tier": "Illegal", "natDexTier": "RU"},
@@ -6894,7 +6894,7 @@
       "natDexTier": "UU"
     },
     "sneasel": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
-    "sneaselhisui": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "sneaselhisui": {"tier": "NFE"},
     "weavile": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "UUBL"},
     "sneasler": {"tier": "Uber", "doublesTier": "DUU", "natDexTier": "Uber"},
     "teddiursa": {"tier": "LC"},
@@ -6908,7 +6908,7 @@
     "slugma": {"tier": "LC"},
     "magcargo": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "swinub": {"tier": "LC"},
-    "piloswine": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "piloswine": {"tier": "NFE"},
     "mamoswine": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "UU"},
     "corsola": {"isNonstandard": "Past", "tier": "Illegal", "natDexTier": "RU"},
     "corsolagalar": {
@@ -6967,7 +6967,7 @@
       "natDexTier": "RU"
     },
     "torchic": {"tier": "LC"},
-    "combusken": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "combusken": {"tier": "NFE"},
     "blaziken": {"tier": "UUBL", "doublesTier": "(DUU)", "natDexTier": "UUBL"},
     "blazikenmega": {
       "isNonstandard": "Past",
@@ -6980,7 +6980,7 @@
     "swampertmega": {
       "isNonstandard": "Past",
       "tier": "Illegal",
-      "natDexTier": "UU"
+      "natDexTier": "RU"
     },
     "poochyena": {"tier": "LC"},
     "mightyena": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
@@ -7553,7 +7553,7 @@
       "natDexTier": "RU"
     },
     "timburr": {"tier": "LC"},
-    "gurdurr": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "gurdurr": {"tier": "NFE"},
     "conkeldurr": {"tier": "RU", "doublesTier": "(DUU)", "natDexTier": "RUBL"},
     "tympole": {"isNonstandard": "Past", "tier": "Illegal", "natDexTier": "LC"},
     "palpitoad": {
@@ -7829,7 +7829,7 @@
       "doublesTier": "(DUU)",
       "natDexTier": "UUBL"
     },
-    "thundurus": {"tier": "RU", "doublesTier": "DUU", "natDexTier": "RU"},
+    "thundurus": {"tier": "RUBL", "doublesTier": "DUU", "natDexTier": "RU"},
     "thundurustherian": {
       "tier": "UU",
       "doublesTier": "(DUU)",
@@ -8073,7 +8073,7 @@
     "crabominable": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "oricorio": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "oricoriopompom": {
-      "tier": "PUBL",
+      "tier": "NUBL",
       "doublesTier": "(DUU)",
       "natDexTier": "RU"
     },
@@ -8373,7 +8373,7 @@
     },
     "melmetalgmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "grookey": {"tier": "LC"},
-    "thwackey": {"tier": "ZU", "doublesTier": "DUU", "natDexTier": "NFE"},
+    "thwackey": {"tier": "NFE"},
     "rillaboom": {"tier": "OU", "doublesTier": "DOU", "natDexTier": "OU"},
     "rillaboomgmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "scorbunny": {"tier": "LC"},
@@ -8560,7 +8560,7 @@
     "crocalor": {"tier": "NFE"},
     "skeledirge": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "UU"},
     "quaxly": {"tier": "LC"},
-    "quaxwell": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "quaxwell": {"tier": "NFE"},
     "quaquaval": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "UU"},
     "lechonk": {"tier": "LC"},
     "oinkologne": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
@@ -8614,7 +8614,7 @@
     "flamigo": {"tier": "PUBL", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "klawf": {"tier": "ZU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "nacli": {"tier": "LC"},
-    "naclstack": {"tier": "ZU", "doublesTier": "NFE", "natDexTier": "NFE"},
+    "naclstack": {"tier": "NFE"},
     "garganacl": {"tier": "OU", "doublesTier": "DUU", "natDexTier": "OU"},
     "glimmet": {"tier": "LC"},
     "glimmora": {"tier": "OU", "doublesTier": "DOU", "natDexTier": "OU"},
@@ -8652,7 +8652,7 @@
     "wochien": {"tier": "PU", "doublesTier": "(DUU)", "natDexTier": "RU"},
     "chiyu": {"tier": "Uber", "doublesTier": "DOU", "natDexTier": "Uber"},
     "koraidon": {"tier": "Uber", "doublesTier": "DUber", "natDexTier": "AG"},
-    "miraidon": {"tier": "Uber", "doublesTier": "DUber", "natDexTier": "AG"},
+    "miraidon": {"tier": "AG", "doublesTier": "DUber", "natDexTier": "AG"},
     "tinkatink": {"tier": "LC"},
     "tinkatuff": {"tier": "NFE"},
     "tinkaton": {"tier": "UU", "doublesTier": "(DUU)", "natDexTier": "RU"},

diff --git a/dex/data/items.json b/dex/data/items.json
@@ -4455,7 +4455,8 @@
       "num": 1785,
       "gen": 8,
       "isPokeball": true,
-      "isNonstandard": "Unobtainable"
+      "isNonstandard": "Unobtainable",
+      "shortDesc": "Placeholder if caught in Poke Ball not in current game."
     },
     "strawberrysweet": {
       "name": "Strawberry Sweet",

diff --git a/dex/data/learnsets.json b/dex/data/learnsets.json
@@ -129122,7 +129122,16 @@
         "drainpunch": ["9M", "7T", "6T", "5T"],
         "dreameater": ["7M", "6M", "5M"],
         "dualchop": ["7T", "6T", "5T"],
-        "echoedvoice": ["9L36", "7M", "7L36", "6M", "6L36", "5M", "5L36"],
+        "echoedvoice": [
+          "9L36",
+          "9S5",
+          "7M",
+          "7L36",
+          "6M",
+          "6L36",
+          "5M",
+          "5L36"
+        ],
         "embargo": ["7M", "6M", "5M"],
         "endure": ["9M"],
         "energyball": ["9M", "7M", "6M", "5M"],
@@ -129168,7 +129177,7 @@
         "playrough": ["9M"],
         "poweruppunch": ["6M"],
         "protect": ["9M", "7M", "6M", "5M"],
-        "psybeam": ["9M", "9L31", "7L31", "6L31", "5L31"],
+        "psybeam": ["9M", "9L31", "9S5", "7L31", "6L31", "5L31"],
         "psychic": [
           "9M",
           "9L57",
@@ -129187,7 +129196,7 @@
         "quickattack": ["9L1", "7L1", "6L6", "5L6", "5S0"],
         "raindance": ["9M", "7M", "6M", "5M"],
         "recycle": ["7T", "6T", "5T"],
-        "relicsong": ["9L50", "9S4", "7T", "7S3", "6T", "5T"],
+        "relicsong": ["9L50", "9S4", "9S5", "7T", "7S3", "6T", "5T"],
         "rest": ["9M", "7M", "6M", "5M"],
         "retaliate": ["6M", "5M"],
         "return": ["7M", "6M", "5M"],
@@ -129212,7 +129221,7 @@
         "shadowclaw": ["9M", "7M", "6M", "5M"],
         "shockwave": ["7T", "6T"],
         "signalbeam": ["7T", "6T", "5T"],
-        "sing": ["9L1", "9S4", "7L1", "7S2", "7S3", "6L16", "5L16"],
+        "sing": ["9L1", "9S4", "9S5", "7L1", "7S2", "7S3", "6L16", "5L16"],
         "skillswap": ["9M", "7T", "6T", "5T"],
         "sleeptalk": ["9M", "7M", "6M", "5T"],
         "snatch": ["7T", "6T", "5T"],
@@ -129271,6 +129280,22 @@
           "generation": 9,
           "level": 70,
           "moves": ["relicsong", "hypervoice", "sing", "psychic"]
+        },
+        {
+          "generation": 9,
+          "level": 50,
+          "shiny": true,
+          "nature": "Modest",
+          "ivs": {
+            "hp": 20,
+            "atk": 20,
+            "def": 20,
+            "spa": 31,
+            "spd": 31,
+            "spe": 31
+          },
+          "moves": ["relicsong", "echoedvoice", "psybeam", "sing"],
+          "pokeball": "cherishball"
         }
       ],
       "eventOnly": true

diff --git a/dex/package.json b/dex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/dex",
-  "version": "0.9.21",
+  "version": "0.9.22",
   "description": "A unification of Pokémon Showdown's client's and server's data layers",
   "repository": "github:pkmn/ps",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/dex-types": "^0.9.21"
+    "@pkmn/dex-types": "^0.9.22"
   },
   "scripts": {
     "lint": "eslint --cache *.ts",

diff --git a/dex/types/package.json b/dex/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/dex-types",
-  "version": "0.9.21",
+  "version": "0.9.22",
   "types": "index.d.ts",
   "description": "Common Pokémon Showdown Dex types shared by @pkmn/dex and @pkmn/sim",
   "repository": "github:pkmn/ps",

diff --git a/integration/package.json b/integration/package.json
@@ -5,22 +5,22 @@
   "dependencies": {
     "@pkmn/client": "file:../client",
     "@pkmn/data": "file:../data",
-    "@pkmn/eslint-config": "^9.0.0",
+    "@pkmn/eslint-config": "^9.1.0",
     "@pkmn/img": "file:../img",
     "@pkmn/protocol": "file:../protocol",
     "@pkmn/randoms": "file:../randoms",
     "@pkmn/sets": "file:../sets",
     "@pkmn/sim": "file:../sim",
     "@pkmn/view": "file:../view",
     "cssnano": "^7.0.6",
-    "eslint": "^9.12.0",
+    "eslint": "^9.14.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.8.3",
     "jest": "^29.7.0",
     "minimist": "^1.2.8",
     "parcel": "^2.12.0",
     "source-map-support": "^0.5.21",
-    "typescript-eslint": "^8.10.0",
+    "typescript-eslint": "^8.12.2",
     "typescript": "^5.6.3"
   },
   "alias": {

diff --git a/mods/package.json b/mods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/mods",
-  "version": "0.9.21",
+  "version": "0.9.22",
   "description": "Support for non-standard mods to @pkmn/sim and @pkmn/dex",
   "repository": "github:pkmn/ps",
   "author": "Guangcong Luo <[email protected]> (http://guangcongluo.com)",
@@ -114,11 +114,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/dex-types": "^0.9.21"
+    "@pkmn/dex-types": "^0.9.22"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.21",
-    "@pkmn/sim": "^0.9.21"
+    "@pkmn/dex": "^0.9.22",
+    "@pkmn/sim": "^0.9.22"
   },
   "scripts": {
     "lint": "eslint --cache src",

diff --git a/mods/src/gen5bw1/pokedex.ts b/mods/src/gen5bw1/pokedex.ts
@@ -221,7 +221,7 @@ export const Pokedex: ModdedSpeciesDataTable = {
 		inherit: true,
 		unreleasedHidden: true,
 	},
-	lillpup: {
+	lillipup: {
 		inherit: true,
 		unreleasedHidden: true,
 	},
@@ -385,7 +385,7 @@ export const Pokedex: ModdedSpeciesDataTable = {
 		inherit: true,
 		unreleasedHidden: true,
 	},
-	lillgant: {
+	lilligant: {
 		inherit: true,
 		unreleasedHidden: true,
 	},

diff --git a/mods/src/gen8bdsp/formats.ts b/mods/src/gen8bdsp/formats.ts
@@ -12,7 +12,6 @@ export const Formats = [
   {
     name: '[Gen 8 BDSP] OU',
     mod: 'gen8bdsp',
-    searchShow: false,
     ruleset: [ 'Standard', 'Evasion Abilities Clause' ],
     banlist: [
       'Uber',

diff --git a/mods/src/gen9predlc/abilities.ts b/mods/src/gen9predlc/abilities.ts
@@ -40,7 +40,19 @@ export const Abilities: ModdedAbilityDataTable = {
 		inherit: true,
 		isNonstandard: "Future",
 	},
-	embodyaspect: {
+	embodyaspectcornerstone: {
+		inherit: true,
+		isNonstandard: "Future",
+	},
+	embodyaspecthearthflame: {
+		inherit: true,
+		isNonstandard: "Future",
+	},
+	embodyaspectteal: {
+		inherit: true,
+		isNonstandard: "Future",
+	},
+	embodyaspectwellspring: {
 		inherit: true,
 		isNonstandard: "Future",
 	},