Randomized format set updates (smogon#10516)

* hopefully fix the conflict? * remove support probopass and carbink * spotlight accommodation * Update sim/teams.ts * Update data/random-battles/gen9/teams.ts * Update data/random-battles/gen9cap/sets.json --------- Co-authored-by: Kris Johnson <[email protected]>
livid-washed · Sep 1, 2024 · 1a96e9a · 1a96e9a
1 parent ed2c970
commit 1a96e9a
Show file tree

Hide file tree

Showing 14 changed files with 229 additions and 212 deletions.
diff --git a/data/random-battles/gen2/sets.json b/data/random-battles/gen2/sets.json
@@ -35,7 +35,7 @@
             },
             {
                 "role": "Fast Attacker",
-                "movepool": ["psychic", "sleeppowder", "stunspore", "substitute"]
+                "movepool": ["psychic", "reflect", "sleeppowder", "stunspore"]
             },
             {
                 "role": "Bulky Attacker",
@@ -1019,9 +1019,8 @@
     "crobat": {
         "sets": [
             {
-                "role": "Bulky Support",
-                "movepool": ["haze", "hiddenpowerground", "rest", "return", "toxic"],
-                "preferredTypes": ["Normal"]
+                "role": "Bulky Attacker",
+                "movepool": ["haze", "hiddenpowerground", "rest", "toxic", "wingattack"]
             },
             {
                 "role": "Generalist",
@@ -1144,6 +1143,10 @@
             {
                 "role": "Generalist",
                 "movepool": ["agility", "batonpass", "curse", "return"]
+            },
+            {
+                "role": "Bulky Setup",
+                "movepool": ["curse", "rest", "return", "sleeptalk"]
             }
         ]
     },
@@ -1179,11 +1182,7 @@
             },
             {
                 "role": "Bulky Attacker",
-                "movepool": ["earthquake", "icebeam", "rest", "sleeptalk"]
-            },
-            {
-                "role": "Setup Sweeper",
-                "movepool": ["bellydrum", "earthquake", "hiddenpowerrock", "rest"]
+                "movepool": ["earthquake", "icebeam", "rest", "sleeptalk", "sludgebomb"]
             }
         ]
     },
@@ -1292,10 +1291,6 @@
             {
                 "role": "Generalist",
                 "movepool": ["explosion", "hiddenpowerbug", "hiddenpowersteel", "rapidspin", "spikes", "toxic"]
-            },
-            {
-                "role": "Bulky Support",
-                "movepool": ["doubleedge", "explosion", "rapidspin", "spikes", "toxic"]
             }
         ]
     },
@@ -1426,12 +1421,12 @@
     "magcargo": {
         "sets": [
             {
-                "role": "Generalist",
-                "movepool": ["fireblast", "flamethrower", "hiddenpowergrass", "rest", "rockslide", "sleeptalk"]
+                "role": "Bulky Attacker",
+                "movepool": ["earthquake", "fireblast", "flamethrower", "hiddenpowergrass", "rest", "rockslide", "sleeptalk"]
             },
             {
                 "role": "Bulky Setup",
-                "movepool": ["curse", "rest", "rockslide", "sleeptalk"]
+                "movepool": ["curse", "fireblast", "flamethrower", "rest", "rockslide"]
             }
         ]
     },
@@ -1526,11 +1521,6 @@
     },
     "porygon2": {
         "sets": [
-            {
-                "role": "Bulky Attacker",
-                "movepool": ["doubleedge", "icebeam", "recover", "thunder", "thunderwave"],
-                "preferredTypes": ["Ice"]
-            },
             {
                 "role": "Bulky Setup",
                 "movepool": ["curse", "doubleedge", "icebeam", "recover", "thunder", "thunderwave"]

diff --git a/data/random-battles/gen3/sets.json b/data/random-battles/gen3/sets.json
@@ -833,13 +833,13 @@
         "sets": [
             {
                 "role": "Fast Attacker",
-                "movepool": ["crosschop", "fireblast", "flamethrower", "focuspunch", "hiddenpowergrass", "hiddenpowerice", "psychic", "substitute", "thunderpunch"],
+                "movepool": ["crosschop", "fireblast", "flamethrower", "focuspunch", "hiddenpowergrass", "hiddenpowerice", "substitute", "thunderpunch", "toxic"],
                 "abilities": ["Flame Body"],
                 "preferredTypes": ["Electric"]
             },
             {
                 "role": "Berry Sweeper",
-                "movepool": ["fireblast", "flamethrower", "hiddenpowergrass", "hiddenpowerice", "psychic", "substitute", "thunderpunch"],
+                "movepool": ["fireblast", "flamethrower", "hiddenpowergrass", "hiddenpowerice", "substitute", "thunderpunch"],
                 "abilities": ["Flame Body"],
                 "preferredTypes": ["Electric"]
             }
@@ -1547,12 +1547,7 @@
         "sets": [
             {
                 "role": "Bulky Support",
-                "movepool": ["earthquake", "hiddenpowerbug", "hiddenpowersteel", "rapidspin", "spikes", "toxic"],
-                "abilities": ["Sturdy"]
-            },
-            {
-                "role": "Generalist",
-                "movepool": ["explosion", "hiddenpowerbug", "hiddenpowersteel", "rapidspin", "spikes", "toxic"],
+                "movepool": ["earthquake", "explosion", "hiddenpowerbug", "hiddenpowersteel", "rapidspin", "spikes", "toxic"],
                 "abilities": ["Sturdy"]
             }
         ]
@@ -1918,11 +1913,6 @@
                 "role": "Bulky Support",
                 "movepool": ["protect", "seismictoss", "toxic", "wish"],
                 "abilities": ["Natural Cure"]
-            },
-            {
-                "role": "Bulky Setup",
-                "movepool": ["calmmind", "icebeam", "softboiled", "thunderbolt"],
-                "abilities": ["Natural Cure"]
             }
         ]
     },
@@ -2492,7 +2482,7 @@
         "sets": [
             {
                 "role": "Bulky Attacker",
-                "movepool": ["aromatherapy", "hiddenpowerfire", "magicalleaf", "spikes", "synthesis", "toxic"],
+                "movepool": ["hiddenpowerfire", "magicalleaf", "spikes", "synthesis"],
                 "abilities": ["Natural Cure"]
             },
             {
@@ -3070,7 +3060,7 @@
                 "role": "Wallbreaker",
                 "movepool": ["earthquake", "extremespeed", "hiddenpowerflying", "overheat", "rockslide"],
                 "abilities": ["Air Lock"],
-                "preferredTypes": ["Ground"]
+                "preferredTypes": ["Ground", "Normal"]
             }
         ]
     },
@@ -3095,7 +3085,7 @@
         "sets": [
             {
                 "role": "Wallbreaker",
-                "movepool": ["extremespeed", "firepunch", "icebeam", "psychoboost", "shadowball", "spikes", "superpower"],
+                "movepool": ["extremespeed", "firepunch", "icebeam", "psychoboost", "shadowball", "superpower"],
                 "abilities": ["Pressure"],
                 "preferredTypes": ["Fighting", "Ghost"]
             }

diff --git a/data/random-battles/gen3/teams.ts b/data/random-battles/gen3/teams.ts
@@ -206,7 +206,7 @@ export class RandomGen3Teams extends RandomGen4Teams {
 		// Add other moves you really want to have, e.g. STAB, recovery, setup.
 
 		// Enforce Seismic Toss and Spore
-		for (const moveid of ['seismictoss', 'spore']) {
+		for (const moveid of ['seismictoss', 'spikes', 'spore']) {
 			if (movePool.includes(moveid)) {
 				counter = this.addMove(moveid, moves, types, abilities, teamDetails, species, isLead,
 					movePool, preferredType, role);

diff --git a/data/random-battles/gen4/sets.json b/data/random-battles/gen4/sets.json
@@ -514,6 +514,11 @@
                 "role": "Staller",
                 "movepool": ["protect", "seismictoss", "toxic", "wish"],
                 "abilities": ["Insomnia"]
+            },
+            {
+                "role": "Bulky Setup",
+                "movepool": ["batonpass", "focusblast", "nastyplot", "psychic"],
+                "abilities": ["Insomnia"]
             }
         ]
     },
@@ -1996,7 +2001,8 @@
             {
                 "role": "Bulky Setup",
                 "movepool": ["batonpass", "encore", "hiddenpowerice", "nastyplot", "thunderbolt"],
-                "abilities": ["Plus"]
+                "abilities": ["Plus"],
+                "preferredTypes": ["Ice"]
             },
             {
                 "role": "Setup Sweeper",
@@ -2011,7 +2017,8 @@
             {
                 "role": "Bulky Setup",
                 "movepool": ["batonpass", "encore", "hiddenpowerice", "nastyplot", "thunderbolt"],
-                "abilities": ["Minus"]
+                "abilities": ["Minus"],
+                "preferredTypes": ["Ice"]
             },
             {
                 "role": "Setup Sweeper",
@@ -2230,7 +2237,7 @@
         "sets": [
             {
                 "role": "Bulky Setup",
-                "movepool": ["batonpass", "calmmind", "earthpower", "psychic", "shadowball", "substitute"],
+                "movepool": ["batonpass", "calmmind", "earthpower", "psychic", "signalbeam", "substitute"],
                 "abilities": ["Levitate"]
             },
             {
@@ -2361,9 +2368,8 @@
             },
             {
                 "role": "Setup Sweeper",
-                "movepool": ["aerialace", "dragondance", "earthquake", "leafblade", "roost"],
-                "abilities": ["Chlorophyll"],
-                "preferredTypes": ["Ground"]
+                "movepool": ["aerialace", "dragondance", "earthquake", "leafblade"],
+                "abilities": ["Chlorophyll"]
             }
         ]
     },
@@ -3258,7 +3264,7 @@
         "sets": [
             {
                 "role": "Fast Attacker",
-                "movepool": ["earthquake", "fireblast", "focusblast", "hiddenpowergrass", "hiddenpowerice", "substitute", "thunderbolt"],
+                "movepool": ["earthquake", "fireblast", "focusblast", "hiddenpowerice", "taunt", "thunderbolt"],
                 "abilities": ["Flame Body"],
                 "preferredTypes": ["Electric"]
             }

diff --git a/data/random-battles/gen5/sets.json b/data/random-battles/gen5/sets.json
@@ -3126,7 +3126,7 @@
             },
             {
                 "role": "Setup Sweeper",
-                "movepool": ["aurasphere", "darkpulse", "flashcannon", "nastyplot", "vacuumwave"],
+                "movepool": ["aurasphere", "flashcannon", "nastyplot", "vacuumwave"],
                 "abilities": ["Inner Focus"]
             }
         ]
@@ -3284,7 +3284,7 @@
         "sets": [
             {
                 "role": "Fast Attacker",
-                "movepool": ["earthquake", "fireblast", "focusblast", "hiddenpowergrass", "hiddenpowerice", "substitute", "thunderbolt"],
+                "movepool": ["earthquake", "fireblast", "focusblast", "hiddenpowerice", "taunt", "thunderbolt"],
                 "abilities": ["Flame Body", "Vital Spirit"],
                 "preferredTypes": ["Electric"]
             }
@@ -4274,7 +4274,7 @@
         "sets": [
             {
                 "role": "Fast Support",
-                "movepool": ["gigadrain", "hiddenpowerfire", "spikes", "suckerpunch", "synthesis", "toxic"],
+                "movepool": ["gigadrain", "hiddenpowerfire", "spikes", "synthesis", "toxic"],
                 "abilities": ["Storm Drain", "Water Absorb"]
             },
             {

diff --git a/data/random-battles/gen6/sets.json b/data/random-battles/gen6/sets.json
@@ -1215,7 +1215,12 @@
         "sets": [
             {
                 "role": "Bulky Attacker",
-                "movepool": ["agility", "dragonpulse", "focusblast", "healbell", "thunderbolt", "voltswitch"],
+                "movepool": ["agility", "dragonpulse", "focusblast", "thunderbolt", "voltswitch"],
+                "abilities": ["Static"]
+            },
+            {
+                "role": "Bulky Support",
+                "movepool": ["discharge", "dragonpulse", "focusblast", "healbell", "rest", "sleeptalk", "voltswitch"],
                 "abilities": ["Static"]
             }
         ]
@@ -1312,7 +1317,8 @@
             {
                 "role": "Fast Attacker",
                 "movepool": ["calmmind", "dazzlinggleam", "morningsun", "psychic", "psyshock", "shadowball", "trick"],
-                "abilities": ["Magic Bounce"]
+                "abilities": ["Magic Bounce"],
+                "preferredTypes": ["Fairy"]
             }
         ]
     },
@@ -2149,7 +2155,7 @@
             {
                 "role": "AV Pivot",
                 "movepool": ["bulletpunch", "closecombat", "heavyslam", "knockoff", "stoneedge"],
-                "abilities": ["Thick Fat"],
+                "abilities": ["Guts", "Thick Fat"],
                 "preferredTypes": ["Dark"]
             },
             {
@@ -2692,13 +2698,7 @@
         "sets": [
             {
                 "role": "Fast Attacker",
-                "movepool": ["fireblast", "knockoff", "playrough", "protect", "pursuit", "suckerpunch", "superpower"],
-                "abilities": ["Justified"],
-                "preferredTypes": ["Fairy"]
-            },
-            {
-                "role": "Setup Sweeper",
-                "movepool": ["knockoff", "playrough", "suckerpunch", "superpower", "swordsdance"],
+                "movepool": ["irontail", "knockoff", "playrough", "pursuit", "suckerpunch", "superpower", "swordsdance"],
                 "abilities": ["Justified"],
                 "preferredTypes": ["Fairy"]
             }
@@ -3507,7 +3507,7 @@
             },
             {
                 "role": "Setup Sweeper",
-                "movepool": ["aurasphere", "darkpulse", "flashcannon", "nastyplot", "vacuumwave"],
+                "movepool": ["aurasphere", "flashcannon", "nastyplot", "vacuumwave"],
                 "abilities": ["Inner Focus"]
             }
         ]
@@ -3693,7 +3693,7 @@
         "sets": [
             {
                 "role": "Bulky Attacker",
-                "movepool": ["earthquake", "fireblast", "focusblast", "hiddenpowergrass", "hiddenpowerice", "substitute", "thunderbolt"],
+                "movepool": ["earthquake", "fireblast", "focusblast", "hiddenpowerice", "taunt", "thunderbolt"],
                 "abilities": ["Flame Body"],
                 "preferredTypes": ["Electric"]
             }
@@ -4723,7 +4723,7 @@
         "sets": [
             {
                 "role": "Fast Support",
-                "movepool": ["gigadrain", "hiddenpowerfire", "knockoff", "spikes", "suckerpunch", "synthesis", "toxic"],
+                "movepool": ["gigadrain", "hiddenpowerfire", "knockoff", "spikes", "synthesis", "toxic"],
                 "abilities": ["Storm Drain", "Water Absorb"]
             },
             {