Import smogon/pokemon-showdown@bd0d0ebe

smogon/pokemon-showdown-client@44de6928

Author: scheibo

client/package.json

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

data/package.json

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

dex/data/aliases.json

@@ -89,8 +89,8 @@
   "gen6ag": "[Gen 6] Anything Goes",
   "crossevo": "[Gen 9] Cross Evolution",
   "mayhem": "[Gen 9] Random Battle Mayhem",
-  "omotm": "[Gen 9] Tier Shift",
-  "lcotm": "[Gen 9] Pure Hackmons",
+  "omotm": "[Gen 9] Alphabet Cup",
+  "lcotm": "[Gen 9] Inheritance",
   "megasnow": "Abomasnow-Mega",
   "maero": "Aerodactyl-Mega",
   "malt": "Altaria-Mega",

dex/data/learnsets.json

@@ -131492,6 +131492,7 @@
         "calmmind": ["9M", "7M", "6M"],
         "camouflage": ["7E", "6E"],
         "captivate": ["7E", "6E"],
+        "celebrate": ["9S0"],
         "charm": ["9M"],
         "chillingwater": ["9M"],
         "confide": ["7M", "6M"],
@@ -131506,7 +131507,7 @@
         "endure": ["9M"],
         "energyball": ["9M", "7M", "6M"],
         "facade": ["9M", "7M", "6M"],
-        "fairywind": ["9L6", "7L6", "6L6"],
+        "fairywind": ["9L6", "9S0", "7L6", "6L6"],
         "flash": ["6M"],
         "frustration": ["7M", "6M"],
         "gigadrain": ["9M", "7T", "6T"],
@@ -131549,10 +131550,19 @@
         "terablast": ["9M"],
         "toxic": ["7M", "6M"],
         "trailblaze": ["9M"],
-        "vinewhip": ["9L1", "7L1", "6L1"],
-        "wish": ["9L20", "7L20", "6L20"],
+        "vinewhip": ["9L1", "9S0", "7L1", "6L1"],
+        "wish": ["9L20", "9S0", "7L20", "6L20"],
         "worryseed": ["7T", "6T"]
-      }
+      },
+      "eventData": [
+        {
+          "generation": 9,
+          "level": 5,
+          "abilities": ["flowerveil"],
+          "moves": ["vinewhip", "fairywind", "wish", "celebrate"],
+          "pokeball": "cherishball"
+        }
+      ]
     },
     "floette": {
       "learnset": {

dex/data/moves.json

@@ -3909,7 +3909,7 @@
     },
     "healingwish": {
       "inherit": true,
-      "condition": {"duration": 2, "onSwitchInPriority": 1},
+      "condition": {"duration": 2},
       "desc": "The user faints and the Pokemon brought out to replace it has its HP fully restored along with having any non-volatile status condition cured. The new Pokemon is sent out at the end of the turn, and the healing happens before hazards take effect. Fails if the user is the last unfainted Pokemon in its party.",
       "shortDesc": "User faints. Replacement is fully healed."
     },
@@ -3972,7 +3972,7 @@
     "luckychant": {"inherit": true, "isNonstandard": null},
     "lunardance": {
       "inherit": true,
-      "condition": {"duration": 2, "onSwitchInPriority": 1},
+      "condition": {"duration": 2},
       "desc": "The user faints and the Pokemon brought out to replace it has its HP and PP fully restored along with having any non-volatile status condition cured. The new Pokemon is sent out at the end of the turn, and the healing happens before hazards take effect. Fails if the user is the last unfainted Pokemon in its party.",
       "shortDesc": "User faints. Replacement is fully healed, with PP."
     },

dex/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/dex",
-  "version": "0.9.36",
+  "version": "0.9.37",
   "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.36"
+    "@pkmn/dex-types": "^0.9.37"
   },
   "scripts": {
     "lint": "eslint --cache *.ts",

dex/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/dex-types",
-  "version": "0.9.36",
+  "version": "0.9.37",
   "types": "index.d.ts",
   "description": "Common Pokémon Showdown Dex types shared by @pkmn/dex and @pkmn/sim",
   "repository": "github:pkmn/ps",

integration/build-client

@@ -604,7 +604,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 				if (isNatDex) {
 					let curItem = item;
 					let curGen = genNum;
-					while (item.isNonstandard && curGen >= 7) {
+					while (curItem.isNonstandard && curGen >= 7) {
 						curItem = Dex.forGen(curGen).items.get(item.id);
 						curGen--;
 					}
@@ -679,6 +679,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 			case 'souldew':
 			// Other
 			// fallsthrough
+			case 'leek':
 			case 'stick':
 			case 'thickclub':
 			case 'lightball':

integration/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@pkmn/client": "file:../client",
     "@pkmn/data": "file:../data",
-    "@pkmn/eslint-config": "^9.11.0",
+    "@pkmn/eslint-config": "^9.12.0",
     "@pkmn/img": "file:../img",
     "@pkmn/protocol": "file:../protocol",
     "@pkmn/randoms": "file:../randoms",
@@ -21,7 +21,7 @@
     "parcel": "^2.15.4",
     "source-map-support": "^0.5.21",
     "typescript-eslint": "^8.38.0",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "alias": {
     "process": false,

mods/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/mods",
-  "version": "0.9.36",
+  "version": "0.9.37",
   "description": "Support for non-standard mods to @pkmn/sim and @pkmn/dex",
   "repository": "github:pkmn/ps",
   "author": "Guangcong Luo <guangcongluo@gmail.com> (http://guangcongluo.com)",
@@ -121,11 +121,11 @@
     "build"
   ],
   "dependencies": {
-    "@pkmn/dex-types": "^0.9.36"
+    "@pkmn/dex-types": "^0.9.37"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.9.36",
-    "@pkmn/sim": "^0.9.36"
+    "@pkmn/dex": "^0.9.37",
+    "@pkmn/sim": "^0.9.37"
   },
   "scripts": {
     "lint": "eslint --cache src",