Import smogon/pokemon-showdown@67354c8f

smogon/pokemon-showdown-client@d7064364
pkmn · Sep 4, 2024 · 05cac58 · 05cac58
1 parent 35f1d40
commit 05cac58
Show file tree

Hide file tree

Showing 52 changed files with 510 additions and 394 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/client",
-  "version": "0.6.25",
+  "version": "0.6.26",
   "description": "Client battle engine for Pokémon Showdown",
   "repository": "github:pkmn/ps",
   "license": "MIT",
@@ -15,11 +15,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/data": "^0.9.12",
-    "@pkmn/protocol": "^0.6.25"
+    "@pkmn/data": "^0.9.13",
+    "@pkmn/protocol": "^0.6.26"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.12"
+    "@pkmn/dex": "^0.9.13"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts",

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

diff --git a/dex/data/aliases.json b/dex/data/aliases.json
@@ -169,6 +169,7 @@
   "arcrock": "Arceus-Rock",
   "arcsteel": "Arceus-Steel",
   "arcwater": "Arceus-Water",
+  "basculegionm": "Basculegion",
   "basculinb": "Basculin-Blue-Striped",
   "basculinblue": "Basculin-Blue-Striped",
   "basculinbluestripe": "Basculin-Blue-Striped",
@@ -302,7 +303,11 @@
   "galardash": "Rapidash-Galar",
   "nddf": "Indeedee-F",
   "zacianc": "Zacian-Crowned",
+  "zacianh": "Zacian",
+  "zacianhero": "Zacian",
   "zamazentac": "Zamazenta-Crowned",
+  "zamazentah": "Zamazenta",
+  "zamazentahero": "Zamazenta",
   "glowbro": "Slowbro-Galar",
   "gbro": "Slowbro-Galar",
   "glowking": "Slowking-Galar",
@@ -417,9 +422,21 @@
   "ufof": "Pokestar UFO",
   "ufoflying": "Pokestar UFO",
   "vivillonmeadow": "Vivillon",
+  "xerneasactive": "Xerneas",
+  "indeedeem": "Indeedee",
+  "polteageistphony": "Polteageist",
+  "rockruffmidday": "Rockruff",
+  "sinisteaphony": "Sinistea",
+  "dudunsparcetwosegment": "Dudunsparce",
   "enamorusi": "Enamorus",
   "enamorusincarnate": "Enamorus",
   "enamorusincarnation": "Enamorus",
+  "gimmighoulchest": "Gimmighoul",
+  "mausholdthree": "Maushold",
+  "oinkolognem": "Oinkologne",
+  "palafinzero": "Palafin",
+  "poltchageistcounterfeit": "Poltchageist",
+  "sinistchaunremarkable": "Sinistcha",
   "squawkabillygreen": "Squawkabilly",
   "squawkabillyg": "Squawkabilly",
   "tealpon": "Ogerpon",
@@ -493,6 +510,7 @@
   "boulder": "Iron Boulder",
   "crown": "Iron Crown",
   "icrown": "Iron Crown",
+  "alcremievanillacream": "Alcremie",
   "alcremierubycream": "Alcremie",
   "alcremiematchacream": "Alcremie",
   "alcremiemintcream": "Alcremie",
@@ -575,6 +593,7 @@
   "miniorblue": "Minior",
   "miniorindigo": "Minior",
   "miniorviolet": "Minior",
+  "unowna": "Unown",
   "unownb": "Unown",
   "unownc": "Unown",
   "unownd": "Unown",
@@ -602,6 +621,7 @@
   "unownz": "Unown",
   "unownexclamation": "Unown",
   "unownquestion": "Unown",
+  "tatsugiricurly": "Tatsugiri",
   "tatsugiridroopy": "Tatsugiri",
   "tatsugiristretchy": "Tatsugiri",
   "pokestargiant2": "Pokestar Giant",

diff --git a/dex/data/formats-data.json b/dex/data/formats-data.json
@@ -5287,7 +5287,7 @@
     "charizardgmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "squirtle": {"tier": "LC"},
     "wartortle": {"tier": "NFE"},
-    "blastoise": {"tier": "RU", "doublesTier": "(DUU)"},
+    "blastoise": {"tier": "RUBL", "doublesTier": "(DUU)"},
     "blastoisemega": {"isNonstandard": "Past", "tier": "Illegal"},
     "blastoisegmax": {"isNonstandard": "Past", "tier": "Illegal"},
     "caterpie": {"isNonstandard": "Past", "tier": "Illegal"},
@@ -5347,7 +5347,7 @@
     "clefable": {"tier": "OU", "doublesTier": "(DUU)"},
     "vulpix": {"tier": "NFE", "doublesTier": "NFE"},
     "vulpixalola": {"tier": "NFE"},
-    "ninetales": {"tier": "PU", "doublesTier": "DUU"},
+    "ninetales": {"tier": "ZU", "doublesTier": "DUU"},
     "ninetalesalola": {"tier": "UU", "doublesTier": "DOU"},
     "igglybuff": {"tier": "LC"},
     "jigglypuff": {"tier": "NFE"},
@@ -5448,7 +5448,7 @@
     "voltorb": {"tier": "LC"},
     "voltorbhisui": {"tier": "LC"},
     "electrode": {"tier": "ZU", "doublesTier": "(DUU)"},
-    "electrodehisui": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "electrodehisui": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "exeggcute": {"tier": "LC"},
     "exeggutor": {"tier": "ZU", "doublesTier": "(DUU)"},
     "exeggutoralola": {"tier": "ZU", "doublesTier": "(DUU)"},
@@ -5694,7 +5694,7 @@
     "kirlia": {"tier": "NFE"},
     "gardevoir": {"tier": "RU", "doublesTier": "(DUU)"},
     "gardevoirmega": {"isNonstandard": "Past", "tier": "Illegal"},
-    "gallade": {"tier": "NU", "doublesTier": "(DUU)"},
+    "gallade": {"tier": "NUBL", "doublesTier": "(DUU)"},
     "gallademega": {"isNonstandard": "Past", "tier": "Illegal"},
     "surskit": {"tier": "LC"},
     "masquerain": {"tier": "ZU", "doublesTier": "(DUU)"},
@@ -6282,7 +6282,7 @@
     "mimikyu": {"tier": "RU", "doublesTier": "(DUU)"},
     "mimikyutotem": {"isNonstandard": "Past", "tier": "Illegal"},
     "mimikyubustedtotem": {"isNonstandard": "Past", "tier": "Illegal"},
-    "bruxish": {"tier": "ZU", "doublesTier": "(DUU)"},
+    "bruxish": {"tier": "ZUBL", "doublesTier": "(DUU)"},
     "drampa": {"isNonstandard": "Past", "tier": "Illegal"},
     "dhelmise": {"isNonstandard": "Past", "tier": "Illegal"},
     "jangmoo": {"tier": "LC"},
@@ -6504,7 +6504,7 @@
     "gimmighoulroaming": {"tier": "LC"},
     "gholdengo": {"tier": "OU", "doublesTier": "DOU"},
     "greattusk": {"tier": "OU", "doublesTier": "DUU"},
-    "brutebonnet": {"tier": "NU", "doublesTier": "DUU"},
+    "brutebonnet": {"tier": "PU", "doublesTier": "DUU"},
     "sandyshocks": {"tier": "UU", "doublesTier": "(DUU)"},
     "screamtail": {"tier": "PU", "doublesTier": "(DUU)"},
     "fluttermane": {"tier": "Uber", "doublesTier": "DUber"},

diff --git a/dex/data/learnsets.json b/dex/data/learnsets.json
@@ -158557,6 +158557,7 @@
         "dreameater": ["7M", "4M"],
         "earthquake": ["9M", "8M", "7M", "4M"],
         "embargo": ["7M", "4M"],
+        "encore": ["9M"],
         "endeavor": ["9M", "7T", "4T"],
         "facade": ["9M", "8M", "7M", "4M"],
         "fakeout": ["9L1", "8L1", "7L27", "4L35"],
@@ -158635,6 +158636,7 @@
         "toxic": ["7M", "4M"],
         "trick": ["9M", "9L1", "8M", "8L1", "7T", "4T"],
         "trickroom": ["9M", "8M", "7M", "4M"],
+        "upperhand": ["9M"],
         "uturn": ["9M", "8M", "7M", "4M"],
         "willowisp": ["9M", "8M", "7M", "4M"]
       }

diff --git a/dex/data/moves.json b/dex/data/moves.json
@@ -9372,7 +9372,7 @@
       "target": "normal",
       "type": "Bug",
       "desc": "Fails unless it is the user's first turn on the field.",
-      "shortDesc": "Hits first. First turn out only."
+      "shortDesc": "Nearly always goes first. First turn out only."
     },
     "fishiousrend": {
       "num": 755,

diff --git a/dex/data/species.json b/dex/data/species.json
@@ -2950,7 +2950,22 @@
       "evoItem": "Razor Claw",
       "evoCondition": "during the day"
     },
-    "enamorus": {"inherit": true, "abilities": {"0": "Healer", "H": "Contrary"}}
+    "enamorus": {
+      "inherit": true,
+      "abilities": {"0": "Healer", "H": "Contrary"}
+    },
+    "kitsunoh": {
+      "inherit": true,
+      "baseStats": {
+        "hp": 80,
+        "atk": 103,
+        "def": 85,
+        "spa": 55,
+        "spd": 80,
+        "spe": 110
+      },
+      "abilities": {"0": "Frisk", "1": "Limber", "H": "Iron Fist"}
+    }
   },
   "9": {
     "bulbasaur": {
@@ -28855,13 +28870,13 @@
       "types": ["Ghost", "Steel"],
       "baseStats": {
         "hp": 80,
-        "atk": 103,
+        "atk": 117,
         "def": 85,
         "spa": 55,
         "spd": 80,
-        "spe": 110
+        "spe": 128
       },
-      "abilities": {"0": "Frisk", "1": "Limber", "H": "Iron Fist"},
+      "abilities": {"0": "Frisk", "1": "Limber", "H": "Trace"},
       "weightkg": 51,
       "prevo": "Nohface",
       "evoType": "trade",

diff --git a/dex/package.json b/dex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/dex",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "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.12"
+    "@pkmn/dex-types": "^0.9.13"
   },
   "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.12",
+  "version": "0.9.13",
   "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/img/package.json b/img/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/img",
-  "version": "0.2.31",
+  "version": "0.2.32",
   "description": "Logic for displaying Pokémon Showdown's sprite/icon resources",
   "repository": "github:pkmn/ps",
   "license": "MIT",

diff --git a/img/src/data/data.json b/img/src/data/data.json
diff --git a/integration/package.json b/integration/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@pkmn/client": "file:../client",
     "@pkmn/data": "file:../data",
-    "@pkmn/eslint-config": "^8.1.0",
+    "@pkmn/eslint-config": "^8.3.0",
     "@pkmn/img": "file:../img",
     "@pkmn/protocol": "file:../protocol",
     "@pkmn/randoms": "file:../randoms",
@@ -14,10 +14,10 @@
     "@pkmn/view": "file:../view",
     "@typescript-eslint/eslint-plugin": "<=7",
     "@typescript-eslint/parser": "<=7",
-    "cssnano": "^7.0.4",
+    "cssnano": "^7.0.5",
     "eslint": "<=8",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^28.6.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jest": "^28.8.2",
     "jest": "^29.7.0",
     "minimist": "^1.2.8",
     "parcel": "^2.12.0",

diff --git a/mods/package.json b/mods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/mods",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "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.12"
+    "@pkmn/dex-types": "^0.9.13"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.12",
-    "@pkmn/sim": "^0.9.12"
+    "@pkmn/dex": "^0.9.13",
+    "@pkmn/sim": "^0.9.13"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts",

diff --git a/mods/src/gen1stadium/scripts.ts b/mods/src/gen1stadium/scripts.ts
@@ -74,7 +74,8 @@ export const Scripts: ModdedBattleScriptsData = {
 	},
 	actions: {
 		inherit: true,
-		runMove(moveOrMoveName, pokemon, targetLoc, sourceEffect) {
+		runMove(moveOrMoveName, pokemon, targetLoc, options) {
+			let sourceEffect = options?.sourceEffect;
 			const move = this.dex.getActiveMove(moveOrMoveName);
 			const target = this.battle.getTarget(pokemon, move, targetLoc);
 			if (target?.subFainted) target.subFainted = null;
@@ -104,12 +105,14 @@ export const Scripts: ModdedBattleScriptsData = {
 			} else {
 				sourceEffect = move;
 			}
-			this.battle.actions.useMove(move, pokemon, target, sourceEffect);
+			this.battle.actions.useMove(move, pokemon, {target, sourceEffect});
 		},
 		// This function deals with AfterMoveSelf events.
 		// This leads with partial trapping moves shenanigans after the move has been used.
-		useMove(moveOrMoveName, pokemon, target, sourceEffect) {
-			const moveResult = this.useMoveInner(moveOrMoveName, pokemon, target, sourceEffect);
+		useMove(moveOrMoveName, pokemon, options) {
+			let sourceEffect = options?.sourceEffect;
+			let target = options?.target;
+			const moveResult = this.useMoveInner(moveOrMoveName, pokemon, {target, sourceEffect});
 
 			if (!sourceEffect && this.battle.effect.id) sourceEffect = this.battle.effect;
 			const baseMove = this.battle.dex.moves.get(moveOrMoveName);
@@ -166,7 +169,9 @@ export const Scripts: ModdedBattleScriptsData = {
 		},
 		// This is the function that actually uses the move, running ModifyMove events.
 		// It uses the move and then deals with the effects after the move.
-		useMoveInner(moveOrMoveName, pokemon, target, sourceEffect) {
+		useMoveInner(moveOrMoveName, pokemon, options) {
+			let sourceEffect = options?.sourceEffect;
+			let target = options?.target;
 			if (!sourceEffect && this.battle.effect.id) sourceEffect = this.battle.effect;
 			const baseMove = this.battle.dex.moves.get(moveOrMoveName);
 			let move = this.battle.dex.getActiveMove(baseMove);