Skip to content

Commit 5eb3d0d

Browse files
ACakeWearingAHatlivid-washedKrisXV
authored
Randomized format set updates (smogon#10250)
* Randomized format set updates * i missed dipplin * zammy * xicro * more xicro * bugfixes * Allow Trick + Nature Power on Oranguru * solar power zard * Regirock and Samurott adjustments * tera elec electrodeh * gen 5-7 foul play min atk EVs/IVs * silvallys * add new incompatibility * Update random-sets.json * remove choice solgaleo * Update data/random-teams.ts * Update data/mods/gen7/random-teams.ts * Update data/mods/gen7/random-teams.ts * Update data/mods/gen6/random-teams.ts * Update data/mods/gen5/random-teams.ts * Update data/mods/gen6/random-teams.ts * Update data/mods/gen5/random-teams.ts --------- Co-authored-by: Kelvin Liu <115855253+livid-washed@users.noreply.github.com> Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
1 parent d2519c4 commit 5eb3d0d

14 files changed

+215
-129
lines changed

‎data/mods/gen3/random-sets.json

+19-6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
"role": "Setup Sweeper",
2626
"movepool": ["bellydrum", "earthquake", "hiddenpowerflying", "rockslide", "substitute"],
2727
"preferredTypes": ["Ground"]
28+
},
29+
{
30+
"role": "Berry Sweeper",
31+
"movepool": ["dragonclaw", "fireblast", "hiddenpowergrass", "substitute"]
2832
}
2933
]
3034
},
@@ -288,6 +292,10 @@
288292
{
289293
"role": "Setup Sweeper",
290294
"movepool": ["bulkup", "crosschop", "hiddenpowerghost", "rockslide", "substitute"]
295+
},
296+
{
297+
"role": "Berry Sweeper",
298+
"movepool": ["bulkup", "hiddenpowerghost", "reversal", "substitute"]
291299
}
292300
]
293301
},
@@ -468,11 +476,12 @@
468476
"sets": [
469477
{
470478
"role": "Wallbreaker",
471-
"movepool": ["brickbreak", "explosion", "fireblast", "haze", "hiddenpowerghost", "rest", "sludgebomb", "toxic"]
479+
"movepool": ["explosion", "fireblast", "hiddenpowerground", "rest", "sludgebomb", "toxic"],
480+
"preferredTypes": ["Ground"]
472481
},
473482
{
474483
"role": "Setup Sweeper",
475-
"movepool": ["brickbreak", "curse", "hiddenpowerghost", "rest", "sludgebomb"]
484+
"movepool": ["curse", "hiddenpowerground", "rest", "sludgebomb"]
476485
}
477486
]
478487
},
@@ -1145,6 +1154,10 @@
11451154
{
11461155
"role": "Staller",
11471156
"movepool": ["encore", "icebeam", "protect", "surf", "toxic"]
1157+
},
1158+
{
1159+
"role": "Bulky Support",
1160+
"movepool": ["icebeam", "rest", "sleeptalk", "surf", "toxic"]
11481161
}
11491162
]
11501163
},
@@ -2088,6 +2101,10 @@
20882101
"role": "Setup Sweeper",
20892102
"movepool": ["brickbreak", "bulkup", "recover", "rockslide", "shadowball", "substitute"],
20902103
"preferredTypes": ["Ghost"]
2104+
},
2105+
{
2106+
"role": "Berry Sweeper",
2107+
"movepool": ["bulkup", "reversal", "shadowball", "substitute"]
20912108
}
20922109
]
20932110
},
@@ -2240,10 +2257,6 @@
22402257
"role": "Staller",
22412258
"movepool": ["encore", "protect", "seismictoss", "shadowball", "substitute", "toxic"]
22422259
},
2243-
{
2244-
"role": "Bulky Attacker",
2245-
"movepool": ["bodyslam", "focuspunch", "shadowball", "substitute"]
2246-
},
22472260
{
22482261
"role": "Bulky Support",
22492262
"movepool": ["protect", "seismictoss", "toxic", "wish"]

‎data/mods/gen3/random-teams.ts

-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,6 @@ export class RandomGen3Teams extends RandomGen4Teams {
441441
if (species.id === 'blissey') return 'Natural Cure';
442442
if (species.id === 'heracross' && role === 'Berry Sweeper') return 'Swarm';
443443
if (species.id === 'xatu') return 'Synchronize';
444-
if (species.id === 'gardevoir') return 'Trace';
445444

446445
let abilityAllowed: Ability[] = [];
447446
// Obtain a list of abilities that are allowed (not culled)

‎data/mods/gen4/random-sets.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -1789,9 +1789,13 @@
17891789
"sharpedo": {
17901790
"level": 85,
17911791
"sets": [
1792+
{
1793+
"role": "Wallbreaker",
1794+
"movepool": ["aquajet", "crunch", "earthquake", "hydropump", "icebeam"]
1795+
},
17921796
{
17931797
"role": "Fast Attacker",
1794-
"movepool": ["aquajet", "crunch", "earthquake", "hiddenpowergrass", "hydropump", "icebeam", "waterfall"]
1798+
"movepool": ["aquajet", "crunch", "earthquake", "icebeam", "waterfall"]
17951799
}
17961800
]
17971801
},
@@ -2717,7 +2721,7 @@
27172721
"sets": [
27182722
{
27192723
"role": "Setup Sweeper",
2720-
"movepool": ["crosschop", "icepunch", "poisonjab", "substitute", "suckerpunch", "swordsdance"]
2724+
"movepool": ["crosschop", "earthquake", "icepunch", "poisonjab", "substitute", "suckerpunch", "swordsdance"]
27212725
}
27222726
]
27232727
},

‎data/mods/gen4/random-teams.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ export class RandomGen4Teams extends RandomGen5Teams {
515515

516516
if (abilities.has('Guts') && !abilities.has('Quick Feet') && moves.has('facade')) return 'Guts';
517517
if (abilities.has('Hydration') && moves.has('raindance') && moves.has('rest')) return 'Hydration';
518-
if (abilities.has('Trace')) return 'Trace';
519518

520519
let abilityAllowed: Ability[] = [];
521520
// Obtain a list of abilities that are allowed (not culled)
@@ -578,6 +577,7 @@ export class RandomGen4Teams extends RandomGen5Teams {
578577
}
579578
}
580579
if (moves.has('bellydrum')) return 'Sitrus Berry';
580+
if (moves.has('waterspout')) return 'Choice Scarf';
581581
if (ability === 'Magic Guard') return 'Life Orb';
582582
if (moves.has('lightscreen') && moves.has('reflect')) return 'Light Clay';
583583
if (moves.has('rest') && !moves.has('sleeptalk') && !['Natural Cure', 'Shed Skin'].includes(ability)) {

‎data/mods/gen5/random-sets.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@
4545
"butterfree": {
4646
"level": 93,
4747
"sets": [
48+
{
49+
"role": "Setup Sweeper",
50+
"movepool": ["bugbuzz", "quiverdance", "sleeppowder", "substitute"]
51+
},
4852
{
4953
"role": "Bulky Setup",
50-
"movepool": ["bugbuzz", "hiddenpowerrock", "psychic", "quiverdance", "sleeppowder", "substitute"]
54+
"movepool": ["bugbuzz", "quiverdance", "roost", "sleeppowder"]
5155
}
5256
]
5357
},
@@ -634,7 +638,7 @@
634638
},
635639
{
636640
"role": "Setup Sweeper",
637-
"movepool": ["focusblast", "icebeam", "lovelykiss", "nastyplot", "psyshock", "substitute"]
641+
"movepool": ["focusblast", "icebeam", "lovelykiss", "nastyplot", "psyshock"]
638642
}
639643
]
640644
},
@@ -2758,7 +2762,7 @@
27582762
"sets": [
27592763
{
27602764
"role": "Setup Sweeper",
2761-
"movepool": ["drainpunch", "icepunch", "poisonjab", "substitute", "suckerpunch", "swordsdance"]
2765+
"movepool": ["drainpunch", "earthquake", "icepunch", "poisonjab", "substitute", "suckerpunch", "swordsdance"]
27622766
}
27632767
]
27642768
},

‎data/mods/gen5/random-teams.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -609,11 +609,11 @@ export class RandomGen5Teams extends RandomGen6Teams {
609609
if (species.id === 'ambipom' && !counter.get('technician')) return 'Pickup';
610610
if (['spiritomb', 'vespiquen', 'weavile'].includes(species.id)) return 'Pressure';
611611
if (species.id === 'druddigon') return 'Rough Skin';
612+
if (species.id === 'zebstrika') return moves.has('wildcharge') ? 'Sap Sipper' : 'Lightning Rod';
612613
if (species.id === 'stoutland') return 'Scrappy';
613614
if (species.id === 'octillery') return 'Sniper';
614615
if (species.id === 'stunfisk') return 'Static';
615616
if (species.id === 'zangoose') return 'Toxic Boost';
616-
if (species.id === 'porygon2' || species.id === 'gardevoir') return 'Trace';
617617

618618
if (abilities.has('Harvest')) return 'Harvest';
619619
if (abilities.has('Shed Skin') && moves.has('rest') && !moves.has('sleeptalk')) return 'Shed Skin';
@@ -699,6 +699,7 @@ export class RandomGen5Teams extends RandomGen6Teams {
699699
}
700700
}
701701
if (moves.has('bellydrum')) return 'Sitrus Berry';
702+
if (moves.has('waterspout')) return 'Choice Scarf';
702703
if (moves.has('shellsmash')) return 'White Herb';
703704
if (moves.has('psychoshift')) return 'Flame Orb';
704705
if (ability === 'Magic Guard' && role !== 'Bulky Support') {
@@ -909,7 +910,7 @@ export class RandomGen5Teams extends RandomGen6Teams {
909910
}
910911

911912
// Minimize confusion damage
912-
if (!counter.get('Physical') && !moves.has('transform')) {
913+
if ((counter.get('Physical') || 0) <= 1 && moves.has('foulplay') && !moves.has('transform')) {
913914
evs.atk = 0;
914915
ivs.atk = hasHiddenPower ? (ivs.atk || 31) - 28 : 0;
915916
}

‎data/mods/gen6/random-sets.json

+26-9
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@
163163
"sets": [
164164
{
165165
"role": "Fast Support",
166-
"movepool": ["encore", "hiddenpowerice", "knockoff", "nastyplot", "nuzzle", "thunderbolt", "voltswitch"]
166+
"movepool": ["encore", "hiddenpowerice", "knockoff", "nastyplot", "nuzzle", "thunderbolt", "voltswitch"],
167+
"preferredTypes": ["Ice"]
167168
},
168169
{
169170
"role": "Fast Attacker",
@@ -710,7 +711,7 @@
710711
},
711712
{
712713
"role": "Setup Sweeper",
713-
"movepool": ["focusblast", "icebeam", "lovelykiss", "nastyplot", "psyshock", "substitute"]
714+
"movepool": ["focusblast", "icebeam", "lovelykiss", "nastyplot", "psyshock"]
714715
}
715716
]
716717
},
@@ -1954,7 +1955,7 @@
19541955
"sets": [
19551956
{
19561957
"role": "Wallbreaker",
1957-
"movepool": ["firefang", "ironhead", "playrough", "suckerpunch", "swordsdance"]
1958+
"movepool": ["ironhead", "knockoff", "playrough", "suckerpunch", "swordsdance"]
19581959
}
19591960
]
19601961
},
@@ -2326,6 +2327,10 @@
23262327
"role": "Fast Support",
23272328
"movepool": ["drainpunch", "fakeout", "knockoff", "recover", "shadowsneak", "stealthrock", "suckerpunch"],
23282329
"preferredTypes": ["Fighting"]
2330+
},
2331+
{
2332+
"role": "Bulky Attacker",
2333+
"movepool": ["drainpunch", "knockoff", "recover", "stealthrock", "thunderwave", "toxic"]
23292334
}
23302335
]
23312336
},
@@ -3131,7 +3136,7 @@
31313136
"sets": [
31323137
{
31333138
"role": "Setup Sweeper",
3134-
"movepool": ["drainpunch", "gunkshot", "icepunch", "substitute", "suckerpunch", "swordsdance"]
3139+
"movepool": ["drainpunch", "earthquake", "gunkshot", "knockoff", "substitute", "suckerpunch", "swordsdance"]
31353140
}
31363141
]
31373142
},
@@ -3381,8 +3386,12 @@
33813386
"sets": [
33823387
{
33833388
"role": "Bulky Attacker",
3384-
"movepool": ["earthquake", "haze", "icepunch", "painsplit", "shadowsneak", "willowisp"],
3389+
"movepool": ["earthquake", "haze", "icepunch", "painsplit", "shadowsneak", "toxic", "willowisp"],
33853390
"preferredTypes": ["Ground"]
3391+
},
3392+
{
3393+
"role": "Staller",
3394+
"movepool": ["earthquake", "protect", "shadowsneak", "toxic"]
33863395
}
33873396
]
33883397
},
@@ -4489,7 +4498,7 @@
44894498
"level": 82,
44904499
"sets": [
44914500
{
4492-
"role": "Fast Attacker",
4501+
"role": "Wallbreaker",
44934502
"movepool": ["highjumpkick", "knockoff", "poisonjab", "stoneedge", "swordsdance", "uturn"],
44944503
"preferredTypes": ["Dark"]
44954504
},
@@ -4880,7 +4889,11 @@
48804889
"sets": [
48814890
{
48824891
"role": "Bulky Setup",
4883-
"movepool": ["energyball", "hurricane", "quiverdance", "sleeppowder", "substitute"]
4892+
"movepool": ["energyball", "hurricane", "quiverdance", "sleeppowder"]
4893+
},
4894+
{
4895+
"role": "Bulky Attacker",
4896+
"movepool": ["bugbuzz", "hurricane", "quiverdance", "sleeppowder"]
48844897
}
48854898
]
48864899
},
@@ -5126,8 +5139,12 @@
51265139
"level": 88,
51275140
"sets": [
51285141
{
5129-
"role": "Staller",
5142+
"role": "Bulky Support",
51305143
"movepool": ["protect", "recycle", "thunderbolt", "toxic"]
5144+
},
5145+
{
5146+
"role": "Staller",
5147+
"movepool": ["recycle", "substitute", "superfang", "thunderbolt", "toxic", "uturn"]
51315148
}
51325149
]
51335150
},
@@ -5154,7 +5171,7 @@
51545171
"sets": [
51555172
{
51565173
"role": "Bulky Support",
5157-
"movepool": ["dazzlinggleam", "foulplay", "spikes", "thunderwave", "toxic"]
5174+
"movepool": ["dazzlinggleam", "foulplay", "spikes", "thunderwave"]
51585175
},
51595176
{
51605177
"role": "Bulky Attacker",

‎data/mods/gen6/random-teams.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -659,12 +659,12 @@ export class RandomGen6Teams extends RandomGen7Teams {
659659
if (species.id === 'muk') return 'Poison Touch';
660660
if (['dusknoir', 'vespiquen'].includes(species.id)) return 'Pressure';
661661
if (species.id === 'druddigon' && role === 'Bulky Support') return 'Rough Skin';
662+
if (species.id === 'zebstrika') return moves.has('wildcharge') ? 'Sap Sipper' : 'Lightning Rod';
662663
if (species.id === 'stoutland' || species.id === 'pangoro' && !counter.get('ironfist')) return 'Scrappy';
663664
if (species.id === 'octillery') return 'Sniper';
664665
if (species.id === 'stunfisk') return 'Static';
665666
if (species.id === 'breloom') return 'Technician';
666667
if (species.id === 'zangoose') return 'Toxic Boost';
667-
if (species.id === 'porygon2' || species.id === 'gardevoir') return 'Trace';
668668

669669
if (abilities.has('Harvest') && (role === 'Bulky Support' || role === 'Staller')) return 'Harvest';
670670
if (abilities.has('Regenerator') && role === 'AV Pivot') return 'Regenerator';
@@ -753,6 +753,7 @@ export class RandomGen6Teams extends RandomGen7Teams {
753753
}
754754
}
755755
if (moves.has('bellydrum')) return 'Sitrus Berry';
756+
if (moves.has('waterspout')) return 'Choice Scarf';
756757
if (moves.has('geomancy') || moves.has('skyattack')) return 'Power Herb';
757758
if (moves.has('shellsmash')) {
758759
return (ability === 'Solid Rock' && !!counter.get('priority')) ? 'Weakness Policy' : 'White Herb';
@@ -911,7 +912,10 @@ export class RandomGen6Teams extends RandomGen7Teams {
911912
const level = this.getLevel(species);
912913

913914
// Minimize confusion damage
914-
if (!counter.get('Physical') && !moves.has('copycat') && !moves.has('transform')) {
915+
if (
916+
(counter.get('Physical') || 0) <= 1 && moves.has('foulplay') &&
917+
!moves.has('copycat') && !moves.has('transform')
918+
) {
915919
evs.atk = 0;
916920
ivs.atk = 0;
917921
}

0 commit comments

Comments
 (0)