Add Pikachu-World event

smogon · Oct 30, 2020 · 501f502 · 501f502
1 parent f158940
commit 501f502
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/data/formats-data.ts b/data/formats-data.ts
@@ -246,8 +246,8 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		doublesTier: "(DUber)",
 	},
 	pikachuworld: {
-		isNonstandard: "Unobtainable",
-		tier: "Unreleased",
+		tier: "(PU)",
+		doublesTier: "(DUU)",
 	},
 	raichu: {
 		randomBattleMoves: ["encore", "focusblast", "grassknot", "nastyplot", "thunderbolt", "voltswitch"],

diff --git a/data/learnsets.ts b/data/learnsets.ts
@@ -3282,7 +3282,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			drainingkiss: ["8M"],
 			electricterrain: ["8M"],
 			electroball: ["8M", "8L12"],
-			electroweb: ["8M"],
+			electroweb: ["8M", "8S0"],
 			encore: ["8M"],
 			endure: ["8M"],
 			facade: ["8M"],
@@ -3293,7 +3293,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			grassknot: ["8M"],
 			growl: ["8L1"],
 			helpinghand: ["8M"],
-			irontail: ["8M"],
+			irontail: ["8M", "8S0"],
 			lightscreen: ["8M", "8L40"],
 			megakick: ["8M"],
 			megapunch: ["8M"],
@@ -3304,7 +3304,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			playrough: ["8M"],
 			present: ["8E"],
 			protect: ["8M"],
-			quickattack: ["8L1"],
+			quickattack: ["8L1", "8S0"],
 			raindance: ["8M"],
 			reflect: ["8M"],
 			rest: ["8M"],
@@ -3322,16 +3322,21 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			tailwhip: ["8L1"],
 			thief: ["8M"],
 			thunder: ["8M", "8L44"],
-			thunderbolt: ["8M", "8L36"],
+			thunderbolt: ["8M", "8L36", "8S0"],
 			thunderpunch: ["8M"],
 			thundershock: ["8L1"],
 			thunderwave: ["8M", "8L4"],
 			tickle: ["8E"],
 			uproar: ["8M"],
 			voltswitch: ["8M"],
+			volttackle: ["8S0"],
 			wildcharge: ["8M"],
 			wish: ["8E"],
 		},
+		eventData: [
+			{generation: 8, level: 25, nature: "Hardy", isHidden: false, moves: ["thunderbolt", "quickattack", "irontail", "electroweb", "volttackle"], pokeball: "pokeball"},
+		],
+		eventOnly: true,
 	},
 	raichu: {
 		learnset: {

diff --git a/data/random-teams.ts b/data/random-teams.ts
@@ -1257,7 +1257,7 @@ export class RandomTeams {
 		} else if (species.baseSpecies === 'Marowak') {
 			item = 'Thick Club';
 		} else if (species.baseSpecies === 'Pikachu') {
-			forme = 'Pikachu' + this.sample(['', '-Original', '-Hoenn', '-Sinnoh', '-Unova', '-Kalos', '-Alola', '-Partner']);
+			forme = 'Pikachu' + this.sample(['', '-Original', '-Hoenn', '-Sinnoh', '-Unova', '-Kalos', '-Alola', '-Partner', '-World']);
 			item = 'Light Ball';
 		} else if (species.name === 'Regieleki' && !isDoubles) {
 			item = 'Normal Gem';