Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-04-26 02:39:38 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Randomized format set udpates (#11655)

Browse Source 
* Randomized format set updates

* updoot

* more thing

* role names

* lint

* Change old gens Golduck from Bulky Attacker to Bulky Setup with subcm as an option

* Remove unnecessary PT

* Level 73 Pikachu in gen 2

* 75% tbolt for Persian in gen 1

* ionnss yelled at me

* Add aura sphere to mewtwo in gen 8

* Make wigglytuff always Competitive in gen 8

* council veto of lum klawf removal

* toxic dreig

* life orb trailblaze mamoswine

* prevent choice trailblaze lmao

* Force Ice Shard on Gen 5 Mamoswine and merge into a single set

---------

Co-authored-by: Kelvin Liu <liuc.kelvin9901@hotmail.com>
Co-authored-by: Kelvin Liu <115855253+livid-washed@users.noreply.github.com>
This commit is contained in:
ACakeWearingAHat 2026-01-01 03:16:12 -06:00 committed by GitHub
parent 07469afc59
commit f10c7af9e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 252 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/random-battles/gen1/data.json
View File

@ -245,7 +245,7 @@
"persian": {
"level": 73,
"moves": ["bodyslam", "bubblebeam", "slash"],
"exclusiveMoves": ["hyperbeam", "thunderbolt"]
"exclusiveMoves": ["hyperbeam", "thunderbolt", "thunderbolt", "thunderbolt"]
},
"psyduck": {
"level": 89,

1
data/random-battles/gen2/sets.json
View File

@ -103,6 +103,7 @@
]
},
"pikachu": {
"level": 73,
"sets": [
{
"role": "Fast Attacker",

6
data/random-battles/gen3/sets.json
View File

@ -806,7 +806,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["calmmind", "hiddenpowerfire", "icebeam", "lovelykiss", "psychic", "substitute"],
"movepool": ["calmmind", "icebeam", "lovelykiss", "psychic", "substitute"],
"abilities": ["Oblivious"]
}
]
@ -1753,7 +1753,7 @@
"sets": [
{
"role": "Bulky Attacker",
"movepool": ["calmmind", "icebeam", "recover", "surf", "toxic"],
"movepool": ["calmmind", "explosion", "icebeam", "recover", "surf", "toxic"],
"abilities": ["Natural Cure"]
}
]
@ -2690,7 +2690,7 @@
},
{
"role": "Wallbreaker",
"movepool": ["earthquake", "explosion", "overheat", "rockslide", "shadowball"],
"movepool": ["earthquake", "explosion", "rockslide", "shadowball"],
"abilities": ["Levitate"],
"preferredTypes": ["Ground"]
}

54
data/random-battles/gen4/sets.json
View File

@ -382,7 +382,8 @@
{
"role": "Bulky Support",
"movepool": ["haze", "hydropump", "icebeam", "rapidspin", "sludgebomb", "surf", "toxicspikes"],
"abilities": ["Clear Body", "Liquid Ooze"]
"abilities": ["Clear Body", "Liquid Ooze"],
"preferredTypes": ["Poison"]
}
]
},
@ -487,6 +488,11 @@
"role": "Bulky Support",
"movepool": ["explosion", "iceshard", "rapidspin", "rockblast", "spikes", "surf", "toxicspikes"],
"abilities": ["Shell Armor", "Skill Link"]
},
{
"role": "Bulky Support",
"movepool": ["explosion", "icebeam", "iceshard", "rapidspin", "spikes", "surf", "toxicspikes"],
"abilities": ["Shell Armor"]
}
]
},
@ -596,7 +602,7 @@
},
{
"role": "Bulky Attacker",
"movepool": ["bulkup", "closecombat", "drainpunch", "icepunch", "machpunch", "stoneedge"],
"movepool": ["bulkup", "closecombat", "icepunch", "machpunch", "stoneedge"],
"abilities": ["Iron Fist"]
}
]
@ -812,10 +818,9 @@
"abilities": ["Swift Swim"]
},
{
"role": "Bulky Support",
"movepool": ["earthpower", "icebeam", "spikes", "stealthrock", "surf", "toxicspikes"],
"abilities": ["Shell Armor", "Swift Swim"],
"preferredTypes": ["Ice"]
"role": "Bulky Attacker",
"movepool": ["icebeam", "spikes", "stealthrock", "surf", "toxicspikes"],
"abilities": ["Shell Armor", "Swift Swim"]
}
]
},
@ -927,7 +932,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["aurasphere", "calmmind", "fireblast", "psychic", "recover", "shadowball"],
"movepool": ["aurasphere", "calmmind", "fireblast", "psychic", "recover", "signalbeam"],
"abilities": ["Pressure"]
}
]
@ -1159,6 +1164,11 @@
"role": "Wallbreaker",
"movepool": ["earthpower", "hiddenpowerfire", "hiddenpowerice", "hiddenpowerrock", "leafstorm", "sludgebomb"],
"abilities": ["Chlorophyll"]
},
{
"role": "Setup Sweeper",
"movepool": ["earthpower", "hiddenpowerfire", "solarbeam", "sunnyday"],
"abilities": ["Chlorophyll"]
}
]
},
@ -1299,9 +1309,14 @@
"granbull": {
"level": 88,
"sets": [
{
"role": "Bulky Support",
"movepool": ["earthquake", "healbell", "return", "thunderwave"],
"abilities": ["Intimidate"]
},
{
"role": "Bulky Attacker",
"movepool": ["closecombat", "crunch", "healbell", "return", "thunderwave"],
"movepool": ["closecombat", "crunch", "return", "thunderwave"],
"abilities": ["Intimidate"]
}
]
@ -1352,7 +1367,8 @@
{
"role": "Fast Attacker",
"movepool": ["closecombat", "earthquake", "megahorn", "nightslash", "stoneedge", "swordsdance"],
"abilities": ["Guts"]
"abilities": ["Guts"],
"preferredTypes": ["Rock"]
}
]
},
@ -1475,16 +1491,10 @@
"level": 84,
"sets": [
{
"role": "Spinner",
"role": "Bulky Support",
"movepool": ["earthquake", "iceshard", "rapidspin", "stealthrock", "stoneedge", "toxic"],
"abilities": ["Sturdy"],
"preferredTypes": ["Rock"]
},
{
"role": "Bulky Attacker",
"movepool": ["earthquake", "gunkshot", "iceshard", "stealthrock", "stoneedge"],
"abilities": ["Sturdy"],
"preferredTypes": ["Rock"]
}
]
},
@ -1680,13 +1690,13 @@
"level": 84,
"sets": [
{
"role": "Fast Attacker",
"movepool": ["agility", "fireblast", "stoneedge", "superpower", "thunderpunch", "vacuumwave"],
"role": "Wallbreaker",
"movepool": ["agility", "earthquake", "fireblast", "stoneedge", "superpower", "vacuumwave"],
"abilities": ["Blaze"]
},
{
"role": "Wallbreaker",
"movepool": ["flareblitz", "stoneedge", "superpower", "swordsdance", "thunderpunch"],
"role": "Fast Attacker",
"movepool": ["earthquake", "flareblitz", "stoneedge", "superpower", "swordsdance"],
"abilities": ["Blaze"]
}
]
@ -2370,7 +2380,7 @@
{
"role": "Wallbreaker",
"movepool": ["hiddenpowerfighting", "shadowclaw", "shadowsneak", "thunderwave", "willowisp"],
"abilities": ["Frisk", "Insomnia"]
"abilities": ["Insomnia"]
}
]
},
@ -2525,7 +2535,7 @@
"sets": [
{
"role": "Bulky Attacker",
"movepool": ["earthquake", "explosion", "rest", "stealthrock", "stoneedge", "thunderwave", "toxic"],
"movepool": ["earthquake", "explosion", "stealthrock", "stoneedge", "thunderwave", "toxic"],
"abilities": ["Clear Body"]
},
{

11
data/random-battles/gen4/teams.ts
View File

@ -215,17 +215,6 @@ export class RandomGen4Teams extends RandomGen5Teams {
this.incompatibleMoves(moves, movePool, statusInflictingMoves, statusInflictingMoves);
}
// Cull filler moves for otherwise fixed set Stealth Rock users
if (!teamDetails.stealthRock) {
if (species.id === 'registeel' && role === 'Staller') {
if (movePool.includes('thunderwave')) this.fastPop(movePool, movePool.indexOf('thunderwave'));
if (moves.size + movePool.length <= this.maxMoveCount) return;
}
if (species.id === 'wormadamtrash' && role === 'Staller') {
if (movePool.includes('suckerpunch')) this.fastPop(movePool, movePool.indexOf('suckerpunch'));
if (moves.size + movePool.length <= this.maxMoveCount) return;
}
}
if (species.id === 'bastiodon') {
// Enforces Toxic too, for good measure.
this.incompatibleMoves(moves, movePool, ['metalburst', 'protect', 'roar'], ['metalburst', 'protect']);

64
data/random-battles/gen5/sets.json
View File

@ -321,9 +321,15 @@
"golduck": {
"level": 88,
"sets": [
{
"role": "Bulky Setup",
"movepool": ["calmmind", "encore", "focusblast", "icebeam", "scald", "substitute"],
"abilities": ["Cloud Nine", "Swift Swim"],
"preferredTypes": ["Ice"]
},
{
"role": "Fast Attacker",
"movepool": ["calmmind", "encore", "focusblast", "hydropump", "icebeam", "scald"],
"movepool": ["calmmind", "encore", "focusblast", "hydropump", "icebeam"],
"abilities": ["Cloud Nine", "Swift Swim"],
"preferredTypes": ["Ice"]
}
@ -418,7 +424,8 @@
{
"role": "Bulky Support",
"movepool": ["haze", "icebeam", "rapidspin", "scald", "sludgebomb", "toxicspikes"],
"abilities": ["Clear Body", "Liquid Ooze"]
"abilities": ["Clear Body", "Liquid Ooze"],
"preferredTypes": ["Poison"]
}
]
},
@ -529,7 +536,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["focusblast", "painsplit", "shadowball", "sludgewave", "substitute", "trick", "willowisp"],
"movepool": ["destinybond", "focusblast", "painsplit", "shadowball", "sludgewave", "substitute", "trick", "willowisp"],
"abilities": ["Levitate"],
"preferredTypes": ["Fighting"]
}
@ -983,7 +990,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "shadowball"],
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "signalbeam"],
"abilities": ["Unnerve"]
}
]
@ -1373,9 +1380,14 @@
"granbull": {
"level": 90,
"sets": [
{
"role": "Bulky Support",
"movepool": ["earthquake", "healbell", "return", "thunderwave"],
"abilities": ["Intimidate"]
},
{
"role": "Bulky Attacker",
"movepool": ["closecombat", "crunch", "healbell", "return", "thunderwave"],
"movepool": ["closecombat", "crunch", "return", "thunderwave"],
"abilities": ["Intimidate"]
}
]
@ -1545,16 +1557,10 @@
"level": 82,
"sets": [
{
"role": "Spinner",
"role": "Bulky Support",
"movepool": ["earthquake", "iceshard", "rapidspin", "stealthrock", "stoneedge", "toxic"],
"abilities": ["Sturdy"],
"preferredTypes": ["Rock"]
},
{
"role": "Bulky Attacker",
"movepool": ["earthquake", "gunkshot", "iceshard", "stealthrock", "stoneedge"],
"abilities": ["Sturdy"],
"preferredTypes": ["Rock"]
}
]
},
@ -2413,7 +2419,7 @@
{
"role": "Wallbreaker",
"movepool": ["hiddenpowerfighting", "shadowclaw", "shadowsneak", "thunderwave", "willowisp"],
"abilities": ["Cursed Body", "Frisk", "Insomnia"]
"abilities": ["Insomnia"]
}
]
},
@ -3426,12 +3432,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["earthquake", "iceshard", "iciclecrash", "stealthrock"],
"abilities": ["Thick Fat"]
},
{
"role": "Fast Attacker",
"movepool": ["earthquake", "iceshard", "iciclecrash", "stoneedge", "superpower"],
"movepool": ["earthquake", "iceshard", "iciclecrash", "stealthrock", "stoneedge", "superpower"],
"abilities": ["Thick Fat"]
}
]
@ -4274,7 +4275,7 @@
},
{
"role": "Staller",
"movepool": ["hurricane", "leechseed", "protect", "substitute"],
"movepool": ["encore", "hurricane", "leechseed", "substitute"],
"abilities": ["Prankster"]
}
]
@ -4353,12 +4354,12 @@
"level": 82,
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["crunch", "dragondance", "highjumpkick", "stoneedge", "zenheadbutt"],
"abilities": ["Intimidate", "Moxie"]
"role": "Bulky Setup",
"movepool": ["crunch", "dragondance", "drainpunch", "stoneedge", "zenheadbutt"],
"abilities": ["Intimidate"]
},
{
"role": "Bulky Setup",
"role": "Bulky Attacker",
"movepool": ["bulkup", "crunch", "drainpunch", "rest"],
"abilities": ["Shed Skin"]
}
@ -4466,7 +4467,7 @@
"sets": [
{
"role": "Bulky Setup",
"movepool": ["calmmind", "focusblast", "psychic", "psyshock", "recover", "signalbeam"],
"movepool": ["calmmind", "focusblast", "psychic", "psyshock", "recover"],
"abilities": ["Magic Guard"]
}
]
@ -4568,9 +4569,13 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["bugbuzz", "gigadrain", "hiddenpowerice", "thunder", "voltswitch"],
"abilities": ["Compound Eyes"],
"preferredTypes": ["Bug"]
"movepool": ["bugbuzz", "hiddenpowerice", "thunder", "voltswitch"],
"abilities": ["Compound Eyes"]
},
{
"role": "Wallbreaker",
"movepool": ["bugbuzz", "energyball", "thunder", "voltswitch"],
"abilities": ["Compound Eyes"]
}
]
},
@ -4956,7 +4961,8 @@
{
"role": "Setup Sweeper",
"movepool": ["calmmind", "earthpower", "focusblast", "psychic", "rockpolish", "sludgewave"],
"abilities": ["Sheer Force"]
"abilities": ["Sheer Force"],
"preferredTypes": ["Poison"]
}
]
},

11
data/random-battles/gen5/teams.ts
View File

@ -236,15 +236,8 @@ export class RandomGen5Teams extends RandomGen6Teams {
if (abilities.includes('Guts')) this.incompatibleMoves(moves, movePool, 'protect', 'swordsdance');
// Cull filler moves for otherwise fixed set Stealth Rock users
if (!teamDetails.stealthRock) {
if (species.id === 'registeel' && role === 'Staller') {
if (movePool.includes('thunderwave')) this.fastPop(movePool, movePool.indexOf('thunderwave'));
if (moves.size + movePool.length <= this.maxMoveCount) return;
}
if (species.baseSpecies === 'Wormadam' && role === 'Staller') {
if (movePool.includes('suckerpunch')) this.fastPop(movePool, movePool.indexOf('suckerpunch'));
if (moves.size + movePool.length <= this.maxMoveCount) return;
}
if (species.id === 'mamoswine') {
this.incompatibleMoves(moves, movePool, ['stealthrock', 'stoneedge'], ['stoneedge', 'superpower']);
}
}

50
data/random-battles/gen6/sets.json
View File

@ -212,7 +212,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["earthpower", "fireblast", "icebeam", "sludgewave", "stealthrock", "toxicspikes"],
"movepool": ["earthpower", "fireblast", "icebeam", "poisonjab", "sludgewave", "stealthrock", "toxicspikes"],
"abilities": ["Sheer Force"],
"preferredTypes": ["Ice"]
}
@ -223,7 +223,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["earthpower", "fireblast", "icebeam", "sludgewave", "substitute", "superpower"],
"movepool": ["earthpower", "fireblast", "icebeam", "poisonjab", "sludgewave", "substitute"],
"abilities": ["Sheer Force"],
"preferredTypes": ["Ice"]
}
@ -339,9 +339,15 @@
"golduck": {
"level": 90,
"sets": [
{
"role": "Bulky Setup",
"movepool": ["calmmind", "encore", "focusblast", "icebeam", "scald", "substitute"],
"abilities": ["Cloud Nine", "Swift Swim"],
"preferredTypes": ["Ice"]
},
{
"role": "Fast Attacker",
"movepool": ["calmmind", "encore", "focusblast", "hydropump", "icebeam", "scald"],
"movepool": ["calmmind", "encore", "focusblast", "hydropump", "icebeam"],
"abilities": ["Cloud Nine", "Swift Swim"],
"preferredTypes": ["Ice"]
}
@ -1056,7 +1062,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "shadowball"],
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "signalbeam"],
"abilities": ["Unnerve"]
}
]
@ -1076,7 +1082,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "shadowball"],
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "signalbeam"],
"abilities": ["Unnerve"]
}
]
@ -2506,6 +2512,11 @@
"role": "Bulky Setup",
"movepool": ["dragondance", "earthquake", "outrage", "roost"],
"abilities": ["Natural Cure"]
},
{
"role": "Bulky Support",
"movepool": ["dracometeor", "earthquake", "fireblast", "healbell", "roost", "toxic"],
"abilities": ["Natural Cure"]
}
]
},
@ -2516,11 +2527,6 @@
"role": "Setup Sweeper",
"movepool": ["dragondance", "earthquake", "return", "roost"],
"abilities": ["Natural Cure"]
},
{
"role": "Bulky Support",
"movepool": ["earthquake", "fireblast", "healbell", "return", "roost"],
"abilities": ["Natural Cure"]
}
]
},
@ -3806,7 +3812,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["doubleedge", "knockoff", "leafblade", "swordsdance", "synthesis", "xscissor"],
"movepool": ["doubleedge", "knockoff", "leafblade", "substitute", "swordsdance", "synthesis"],
"abilities": ["Chlorophyll"],
"preferredTypes": ["Dark"]
}
@ -4079,9 +4085,13 @@
"sets": [
{
"role": "Bulky Attacker",
"movepool": ["drainpunch", "knockoff", "return", "substitute", "thunderwave"],
"abilities": ["Slow Start"],
"preferredTypes": ["Dark"]
"movepool": ["drainpunch", "knockoff", "return", "thunderwave"],
"abilities": ["Slow Start"]
},
{
"role": "Bulky Support",
"movepool": ["knockoff", "return", "substitute", "thunderwave"],
"abilities": ["Slow Start"]
}
]
},
@ -4822,9 +4832,9 @@
"level": 83,
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["dragondance", "highjumpkick", "ironhead", "knockoff"],
"abilities": ["Intimidate", "Moxie"]
"role": "Bulky Attacker",
"movepool": ["dragondance", "drainpunch", "ironhead", "knockoff"],
"abilities": ["Intimidate"]
},
{
"role": "Bulky Setup",
@ -4937,7 +4947,7 @@
"sets": [
{
"role": "Bulky Setup",
"movepool": ["calmmind", "focusblast", "psychic", "psyshock", "recover", "signalbeam"],
"movepool": ["calmmind", "focusblast", "psychic", "psyshock", "recover"],
"abilities": ["Magic Guard"]
}
]
@ -5045,7 +5055,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["bugbuzz", "gigadrain", "stickyweb", "thunder", "voltswitch"],
"movepool": ["bugbuzz", "energyball", "stickyweb", "thunder", "voltswitch"],
"abilities": ["Compound Eyes"],
"preferredTypes": ["Bug"]
}
@ -5293,7 +5303,7 @@
},
{
"role": "Bulky Attacker",
"movepool": ["darkpulse", "dracometeor", "fireblast", "roost", "uturn"],
"movepool": ["darkpulse", "dracometeor", "fireblast", "roost", "toxic", "uturn"],
"abilities": ["Levitate"]
},
{

2
data/random-battles/gen6/teams.ts
View File

@ -227,7 +227,7 @@ export class RandomGen6Teams extends RandomGen7Teams {
['hornleech', 'woodhammer'],
[['gigadrain', 'leafstorm'], ['leafstorm', 'petaldance', 'powerwhip']],
['wildcharge', 'thunderbolt'],
['gunkshot', 'poisonjab'],
[['gunkshot', 'sludgewave'], 'poisonjab'],
[['drainpunch', 'focusblast'], ['closecombat', 'highjumpkick', 'superpower']],
['stoneedge', 'headsmash'],
['dracometeor', 'dragonpulse'],

57
data/random-battles/gen7/sets.json
View File

@ -283,7 +283,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["earthpower", "fireblast", "icebeam", "sludgewave", "stealthrock", "toxicspikes"],
"movepool": ["earthpower", "fireblast", "icebeam", "poisonjab", "sludgewave", "stealthrock", "toxicspikes"],
"abilities": ["Sheer Force"],
"preferredTypes": ["Ice"]
}
@ -294,7 +294,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["earthpower", "fireblast", "icebeam", "sludgewave", "substitute", "superpower"],
"movepool": ["earthpower", "fireblast", "icebeam", "poisonjab", "sludgewave", "substitute", "throatchop"],
"abilities": ["Sheer Force"],
"preferredTypes": ["Ice"]
}
@ -453,10 +453,16 @@
"level": 93,
"sets": [
{
"role": "Fast Attacker",
"movepool": ["calmmind", "encore", "focusblast", "hydropump", "icebeam", "scald"],
"role": "Bulky Setup",
"movepool": ["calmmind", "encore", "focusblast", "icebeam", "scald", "substitute"],
"abilities": ["Cloud Nine", "Swift Swim"],
"preferredTypes": ["Ice"]
},
{
"role": "Fast Attacker",
"movepool": ["calmmind", "encore", "focusblast", "hydropump", "icebeam"],
"abilities": ["Cloud Nine", "Swift Swim"],
"preferredTypes": ["Ice"]
}
]
},
@ -1269,7 +1275,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "shadowball"],
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "signalbeam"],
"abilities": ["Unnerve"]
}
]
@ -1289,7 +1295,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "shadowball"],
"movepool": ["aurasphere", "calmmind", "fireblast", "psystrike", "recover", "signalbeam"],
"abilities": ["Unnerve"]
}
]
@ -2748,6 +2754,11 @@
"altaria": {
"level": 92,
"sets": [
{
"role": "Bulky Setup",
"movepool": ["dragondance", "earthquake", "outrage", "roost"],
"abilities": ["Natural Cure"]
},
{
"role": "Bulky Support",
"movepool": ["defog", "dracometeor", "earthquake", "fireblast", "healbell", "roost", "toxic"],
@ -4115,7 +4126,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["doubleedge", "knockoff", "leafblade", "swordsdance", "synthesis", "xscissor"],
"movepool": ["doubleedge", "knockoff", "leafblade", "substitute", "swordsdance", "synthesis"],
"abilities": ["Chlorophyll"],
"preferredTypes": ["Dark"]
}
@ -4406,9 +4417,13 @@
"sets": [
{
"role": "Bulky Attacker",
"movepool": ["drainpunch", "knockoff", "return", "substitute", "thunderwave"],
"abilities": ["Slow Start"],
"preferredTypes": ["Dark"]
"movepool": ["drainpunch", "knockoff", "return", "thunderwave"],
"abilities": ["Slow Start"]
},
{
"role": "Bulky Support",
"movepool": ["knockoff", "return", "substitute", "thunderwave"],
"abilities": ["Slow Start"]
}
]
},
@ -5200,9 +5215,9 @@
"level": 84,
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["dragondance", "highjumpkick", "ironhead", "knockoff"],
"abilities": ["Intimidate", "Moxie"]
"role": "Bulky Attacker",
"movepool": ["dragondance", "drainpunch", "ironhead", "knockoff"],
"abilities": ["Intimidate"]
},
{
"role": "Bulky Setup",
@ -5315,7 +5330,7 @@
"sets": [
{
"role": "Bulky Setup",
"movepool": ["calmmind", "focusblast", "psychic", "psyshock", "recover", "signalbeam"],
"movepool": ["calmmind", "focusblast", "psychic", "psyshock", "recover"],
"abilities": ["Magic Guard"]
}
]
@ -5429,7 +5444,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["bugbuzz", "gigadrain", "stickyweb", "thunder", "voltswitch"],
"movepool": ["bugbuzz", "energyball", "stickyweb", "thunder", "voltswitch"],
"abilities": ["Compound Eyes"],
"preferredTypes": ["Bug"]
}
@ -5694,7 +5709,7 @@
},
{
"role": "Bulky Attacker",
"movepool": ["darkpulse", "defog", "dracometeor", "fireblast", "roost", "uturn"],
"movepool": ["darkpulse", "defog", "dracometeor", "fireblast", "roost", "toxic", "uturn"],
"abilities": ["Levitate"]
},
{
@ -7615,9 +7630,10 @@
"level": 77,
"sets": [
{
"role": "Bulky Attacker",
"role": "Z-Move user",
"movepool": ["calmmind", "flashcannon", "fleurcannon", "shiftgear"],
"abilities": ["Soul-Heart"]
"abilities": ["Soul-Heart"],
"preferredTypes": ["Fairy"]
},
{
"role": "Bulky Support",
@ -7625,10 +7641,9 @@
"abilities": ["Soul-Heart"]
},
{
"role": "Z-Move user",
"role": "Bulky Setup",
"movepool": ["aurasphere", "fleurcannon", "ironhead", "shiftgear"],
"abilities": ["Soul-Heart"],
"preferredTypes": ["Fairy", "Steel"]
"abilities": ["Soul-Heart"]
}
]
},

4
data/random-battles/gen7/teams.ts
View File

@ -345,7 +345,7 @@ export class RandomGen7Teams extends RandomGen8Teams {
['hornleech', 'woodhammer'],
[['gigadrain', 'leafstorm'], ['energyball', 'leafstorm', 'petaldance', 'powerwhip']],
['wildcharge', 'thunderbolt'],
['gunkshot', 'poisonjab'],
[['gunkshot', 'sludgewave'], 'poisonjab'],
[['drainpunch', 'focusblast'], ['closecombat', 'highjumpkick', 'superpower']],
['dracometeor', 'dragonpulse'],
['dragonclaw', 'outrage'],
@ -933,7 +933,7 @@ export class RandomGen7Teams extends RandomGen8Teams {
if (ability === 'Sturdy' && moves.has('explosion') && !counter.get('speedsetup')) return 'Custap Berry';
if (types.includes('Normal') && moves.has('fakeout') && !!counter.get('Normal')) return 'Silk Scarf';
if (species.id === 'latias' || species.id === 'latios') return 'Soul Dew';
if (role === 'Bulky Setup' && !!counter.get('speedsetup') && !moves.has('swordsdance')) {
if (role === 'Bulky Setup' && (!!counter.get('speedsetup') || moves.has('shiftgear')) && !moves.has('swordsdance')) {
return 'Weakness Policy';
}
if (species.id === 'palkia') return 'Lustrous Orb';

2
data/random-battles/gen8/data.json
View File

@ -458,7 +458,7 @@
},
"mewtwo": {
"level": 70,
"moves": ["fireblast", "nastyplot", "psystrike", "recover", "shadowball"],
"moves": ["aurasphere", "fireblast", "nastyplot", "psystrike", "recover"],
"doublesLevel": 74,
"doublesMoves": ["aurasphere", "icebeam", "nastyplot", "psystrike", "recover"]
},

2
data/random-battles/gen8/teams.ts
View File

@ -1526,7 +1526,7 @@ export class RandomGen8Teams {
case 'Cloud Nine':
return (!isNoDynamax || species.id !== 'golduck');
case 'Competitive':
return (counter.get('Special') < 2 || (moves.has('rest') && moves.has('sleeptalk')));
return (moves.has('rest') && moves.has('sleeptalk'));
case 'Compound Eyes': case 'No Guard':
return !counter.get('inaccurate');
case 'Cursed Body':

78
data/random-battles/gen9/doubles-sets.json
View File

@ -1041,7 +1041,7 @@
"role": "Offensive Protect",
"movepool": ["Hurricane", "Hyper Voice", "Protect", "Tailwind"],
"abilities": ["Tinted Lens"],
"teraTypes": ["Flying"]
"teraTypes": ["Normal", "Steel"]
}
]
},
@ -1480,7 +1480,7 @@
"sets": [
{
"role": "Doubles Support",
"movepool": ["Heal Pulse", "Helping Hand", "Hyper Voice", "Protect", "Seismic Toss", "Soft-Boiled", "Thunder Wave"],
"movepool": ["Helping Hand", "Hyper Voice", "Life Dew", "Soft-Boiled", "Thunder Wave"],
"abilities": ["Healer"],
"teraTypes": ["Fairy", "Ghost", "Poison"]
}
@ -1538,13 +1538,13 @@
"role": "Doubles Bulky Setup",
"movepool": ["Dragon Dance", "High Horsepower", "Knock Off", "Protect", "Rock Slide", "Stone Edge"],
"abilities": ["Sand Stream"],
"teraTypes": ["Ghost", "Rock", "Steel"]
"teraTypes": ["Ghost", "Rock"]
},
{
"role": "Doubles Bulky Attacker",
"movepool": ["Fire Blast", "High Horsepower", "Icy Wind", "Knock Off", "Rock Slide", "Stone Edge"],
"abilities": ["Sand Stream"],
"teraTypes": ["Flying", "Ghost", "Steel"]
"teraTypes": ["Flying", "Ghost"]
}
]
},
@ -1682,7 +1682,7 @@
},
{
"role": "Doubles Wallbreaker",
"movepool": ["Dazzling Gleam", "Moonblast", "Mystical Fire", "Psychic", "Trick"],
"movepool": ["Dazzling Gleam", "Moonblast", "Mystical Fire", "Psychic"],
"abilities": ["Trace"],
"teraTypes": ["Fairy", "Fire", "Steel"]
}
@ -2023,7 +2023,7 @@
"sets": [
{
"role": "Doubles Support",
"movepool": ["Energy Ball", "Helping Hand", "Hurricane", "Protect", "Tailwind", "Wide Guard"],
"movepool": ["Energy Ball", "Hurricane", "Protect", "Tailwind", "Wide Guard"],
"abilities": ["Harvest"],
"teraTypes": ["Steel"]
}
@ -2575,7 +2575,7 @@
"sets": [
{
"role": "Doubles Support",
"movepool": ["Encore", "Helping Hand", "Hydro Pump", "Icy Wind", "Tailwind", "Tickle"],
"movepool": ["Encore", "Helping Hand", "Hydro Pump", "Icy Wind", "Tailwind"],
"abilities": ["Storm Drain"],
"teraTypes": ["Fire", "Ground"]
}
@ -3086,7 +3086,7 @@
"role": "Bulky Protect",
"movepool": ["Ice Beam", "Protect", "Scald", "Tail Glow"],
"abilities": ["Hydration"],
"teraTypes": ["Grass", "Steel", "Water"]
"teraTypes": ["Grass", "Steel"]
},
{
"role": "Doubles Bulky Setup",
@ -3486,13 +3486,7 @@
"sets": [
{
"role": "Doubles Bulky Attacker",
"movepool": ["Encore", "Moonblast", "Tailwind", "Taunt"],
"abilities": ["Prankster"],
"teraTypes": ["Fire", "Ghost", "Steel"]
},
{
"role": "Doubles Support",
"movepool": ["Encore", "Helping Hand", "Moonblast", "Tailwind"],
"movepool": ["Encore", "Helping Hand", "Moonblast", "Tailwind", "Taunt"],
"abilities": ["Prankster"],
"teraTypes": ["Fire", "Ghost", "Steel"]
}
@ -4298,7 +4292,7 @@
"sets": [
{
"role": "Choice Item user",
"movepool": ["Aura Sphere", "Dark Pulse", "Dragon Pulse", "Muddy Water", "U-turn"],
"movepool": ["Aura Sphere", "Dark Pulse", "Dragon Pulse", "Muddy Water"],
"abilities": ["Mega Launcher"],
"teraTypes": ["Dark", "Dragon", "Fighting"]
},
@ -4615,7 +4609,7 @@
"teraTypes": ["Ground"]
},
{
"role": "Doubles Setup Sweeper",
"role": "Doubles Bulky Setup",
"movepool": ["Air Slash", "Protect", "Quiver Dance", "Revelation Dance"],
"abilities": ["Dancer"],
"teraTypes": ["Ground"]
@ -4632,7 +4626,7 @@
"teraTypes": ["Ground"]
},
{
"role": "Doubles Setup Sweeper",
"role": "Doubles Bulky Setup",
"movepool": ["Air Slash", "Protect", "Quiver Dance", "Revelation Dance"],
"abilities": ["Dancer"],
"teraTypes": ["Ground"]
@ -4649,7 +4643,7 @@
"teraTypes": ["Fighting", "Ground"]
},
{
"role": "Doubles Setup Sweeper",
"role": "Doubles Bulky Setup",
"movepool": ["Air Slash", "Protect", "Quiver Dance", "Revelation Dance"],
"abilities": ["Dancer"],
"teraTypes": ["Fighting", "Ground"]
@ -4666,7 +4660,7 @@
"teraTypes": ["Fighting", "Ground"]
},
{
"role": "Doubles Setup Sweeper",
"role": "Doubles Bulky Setup",
"movepool": ["Air Slash", "Protect", "Quiver Dance", "Revelation Dance"],
"abilities": ["Dancer"],
"teraTypes": ["Fighting", "Ground"]
@ -5183,8 +5177,8 @@
"teraTypes": ["Dragon", "Steel"]
},
{
"role": "Doubles Support",
"movepool": ["Glare", "High Horsepower", "Rest", "Stealth Rock", "Stone Edge"],
"role": "Doubles Bulky Attacker",
"movepool": ["Glare", "High Horsepower", "Rest", "Stone Edge"],
"abilities": ["Shed Skin"],
"teraTypes": ["Dragon", "Steel"]
}
@ -5206,7 +5200,7 @@
"sets": [
{
"role": "Doubles Wallbreaker",
"movepool": ["Close Combat", "Poison Jab", "Protect", "Psychic Fangs", "Waterfall"],
"movepool": ["Close Combat", "Flip Turn", "Poison Jab", "Protect", "Waterfall"],
"abilities": ["Propeller Tail"],
"teraTypes": ["Fighting"]
}
@ -5316,6 +5310,12 @@
"movepool": ["Alluring Voice", "Dazzling Gleam", "Decorate", "Encore", "Protect"],
"abilities": ["Aroma Veil"],
"teraTypes": ["Steel"]
},
{
"role": "Doubles Bulky Attacker",
"movepool": ["Alluring Voice", "Dazzling Gleam", "Decorate", "Helping Hand", "Protect"],
"abilities": ["Aroma Veil"],
"teraTypes": ["Steel"]
}
]
},
@ -5335,9 +5335,9 @@
"sets": [
{
"role": "Doubles Support",
"movepool": ["Electroweb", "Recover", "Thunderbolt", "Toxic Spikes"],
"movepool": ["Electroweb", "Recover", "Scald", "Thunderbolt"],
"abilities": ["Electric Surge"],
"teraTypes": ["Grass"]
"teraTypes": ["Grass", "Water"]
}
]
},
@ -5515,7 +5515,7 @@
"sets": [
{
"role": "Doubles Wallbreaker",
"movepool": ["Close Combat", "Coaching", "Crunch", "Howl", "Iron Head", "Psychic Fangs", "Stone Edge"],
"movepool": ["Close Combat", "Coaching", "Crunch", "Howl", "Stone Edge"],
"abilities": ["Dauntless Shield"],
"teraTypes": ["Dark", "Fighting", "Steel"]
},
@ -6121,7 +6121,7 @@
"role": "Doubles Support",
"movepool": ["Energy Ball", "Fire Blast", "Protect", "Rage Powder", "Will-O-Wisp"],
"abilities": ["Chlorophyll"],
"teraTypes": ["Fire", "Grass", "Steel"]
"teraTypes": ["Fire", "Steel"]
}
]
},
@ -6360,7 +6360,13 @@
"sets": [
{
"role": "Doubles Wallbreaker",
"movepool": ["Hyper Voice", "Nasty Plot", "Protect", "Psychic", "Trick Room"],
"movepool": ["Hyper Voice", "Protect", "Psychic", "Trick Room"],
"abilities": ["Armor Tail"],
"teraTypes": ["Fairy"]
},
{
"role": "Doubles Bulky Attacker",
"movepool": ["Hyper Voice", "Nasty Plot", "Psychic", "Trick Room"],
"abilities": ["Armor Tail"],
"teraTypes": ["Fairy"]
}
@ -6422,9 +6428,15 @@
"sets": [
{
"role": "Doubles Bulky Attacker",
"movepool": ["Close Combat", "Crunch", "Protect", "Rage Powder", "Seed Bomb", "Spore", "Sucker Punch"],
"movepool": ["Close Combat", "Crunch", "Protect", "Seed Bomb", "Spore", "Sucker Punch"],
"abilities": ["Protosynthesis"],
"teraTypes": ["Dark", "Poison"]
},
{
"role": "Doubles Support",
"movepool": ["Rage Powder", "Seed Bomb", "Spore", "Sucker Punch"],
"abilities": ["Protosynthesis"],
"teraTypes": ["Ghost", "Poison"]
}
]
},
@ -6669,7 +6681,13 @@
"sets": [
{
"role": "Bulky Protect",
"movepool": ["Knock Off", "Leech Seed", "Pollen Puff", "Protect", "Ruination"],
"movepool": ["Knock Off", "Leech Seed", "Pollen Puff", "Protect"],
"abilities": ["Tablets of Ruin"],
"teraTypes": ["Poison"]
},
{
"role": "Bulky Protect",
"movepool": ["Knock Off", "Leech Seed", "Protect", "Ruination"],
"abilities": ["Tablets of Ruin"],
"teraTypes": ["Poison"]
}

2
data/random-battles/gen9/factory-sets.json
View File

@ -757,7 +757,7 @@
"item": ["Choice Specs"],
"ability": ["Infiltrator"],
"evs": {"spa": 252, "spd": 4, "spe": 252},
"nature": ["Timid", "Modest"],
"nature": ["Timid"],
"teraType": ["Dragon", "Ghost"],
"moves": [["Draco Meteor"], ["Shadow Ball"], ["Flamethrower"], ["U-turn"]]
}, {

86
data/random-battles/gen9/sets.json
View File

@ -60,13 +60,13 @@
"teraTypes": ["Dark", "Ground"]
},
{
"role": "Setup Sweeper",
"role": "Bulky Setup",
"movepool": ["Coil", "Earthquake", "Gunk Shot", "Trailblaze"],
"abilities": ["Intimidate"],
"teraTypes": ["Grass", "Ground"]
},
{
"role": "Fast Bulky Setup",
"role": "Bulky Attacker",
"movepool": ["Coil", "Earthquake", "Gunk Shot", "Sucker Punch"],
"abilities": ["Intimidate"],
"teraTypes": ["Dark", "Ground"]
@ -296,7 +296,7 @@
"level": 90,
"sets": [
{
"role": "Fast Bulky Setup",
"role": "Bulky Setup",
"movepool": ["Encore", "Grass Knot", "Hydro Pump", "Ice Beam", "Nasty Plot"],
"abilities": ["Cloud Nine", "Swift Swim"],
"teraTypes": ["Water"]
@ -694,7 +694,7 @@
"sets": [
{
"role": "Setup Sweeper",
"movepool": ["Close Combat", "Drain Punch", "Ice Punch", "Knock Off", "Mach Punch", "Rapid Spin", "Swords Dance"],
"movepool": ["Drain Punch", "Ice Punch", "Knock Off", "Mach Punch", "Rapid Spin", "Swords Dance"],
"abilities": ["Inner Focus", "Iron Fist"],
"teraTypes": ["Dark", "Fighting"]
},
@ -1417,6 +1417,12 @@
"movepool": ["Body Press", "Iron Head", "Rapid Spin", "Spikes", "Stealth Rock"],
"abilities": ["Sturdy"],
"teraTypes": ["Fighting", "Water"]
},
{
"role": "Bulky Support",
"movepool": ["Iron Head", "Rapid Spin", "Spikes", "Stealth Rock", "Thunder Wave"],
"abilities": ["Sturdy"],
"teraTypes": ["Water"]
}
]
},
@ -2259,7 +2265,7 @@
"teraTypes": ["Dark", "Fire", "Grass", "Ground", "Poison"]
},
{
"role": "Setup Sweeper",
"role": "Bulky Setup",
"movepool": ["Earthquake", "Gunk Shot", "Swords Dance", "Trailblaze"],
"abilities": ["Infiltrator"],
"teraTypes": ["Grass", "Ground"]
@ -3044,7 +3050,7 @@
{
"role": "Fast Attacker",
"movepool": ["Body Press", "Flash Cannon", "Thunderbolt", "Volt Switch"],
"abilities": ["Magnet Pull"],
"abilities": ["Analytic", "Magnet Pull"],
"teraTypes": ["Electric", "Fighting", "Flying", "Water"]
},
{
@ -3179,7 +3185,7 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["Earthquake", "Ice Shard", "Icicle Crash", "Knock Off", "Stealth Rock"],
"movepool": ["Earthquake", "Ice Shard", "Icicle Crash", "Knock Off", "Stealth Rock", "Trailblaze"],
"abilities": ["Thick Fat"],
"teraTypes": ["Ground", "Ice"]
}
@ -3241,7 +3247,7 @@
},
{
"role": "Bulky Support",
"movepool": ["Earthquake", "Pain Split", "Poltergeist", "Shadow Sneak", "Will-O-Wisp"],
"movepool": ["Earthquake", "Pain Split", "Poltergeist", "Will-O-Wisp"],
"abilities": ["Frisk"],
"teraTypes": ["Dark", "Fairy"]
},
@ -3904,7 +3910,7 @@
"teraTypes": ["Fire"]
},
{
"role": "Setup Sweeper",
"role": "Bulky Setup",
"movepool": ["Bulk Up", "Drain Punch", "Flare Blitz", "Trailblaze"],
"abilities": ["Reckless"],
"teraTypes": ["Fighting", "Grass"]
@ -4011,15 +4017,9 @@
"sets": [
{
"role": "Fast Support",
"movepool": ["Encore", "Giga Drain", "Moonblast", "Stun Spore", "U-turn"],
"movepool": ["Encore", "Giga Drain", "Leech Seed", "Moonblast", "Stun Spore", "Substitute", "U-turn"],
"abilities": ["Prankster"],
"teraTypes": ["Poison", "Steel"]
},
{
"role": "Bulky Support",
"movepool": ["Encore", "Leech Seed", "Moonblast", "Substitute"],
"abilities": ["Prankster"],
"teraTypes": ["Steel"]
}
]
},
@ -4095,9 +4095,15 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["Bulk Up", "Earthquake", "Gunk Shot", "Knock Off", "Stealth Rock", "Stone Edge"],
"movepool": ["Earthquake", "Gunk Shot", "Knock Off", "Stealth Rock", "Stone Edge"],
"abilities": ["Intimidate"],
"teraTypes": ["Ground", "Poison"]
},
{
"role": "Bulky Setup",
"movepool": ["Bulk Up", "Earthquake", "Gunk Shot", "Knock Off"],
"abilities": ["Intimidate"],
"teraTypes": ["Poison"]
}
]
},
@ -4110,12 +4116,6 @@
"abilities": ["Shed Skin"],
"teraTypes": ["Poison"]
},
{
"role": "Setup Sweeper",
"movepool": ["Close Combat", "Dragon Dance", "Knock Off", "Poison Jab"],
"abilities": ["Intimidate"],
"teraTypes": ["Poison"]
},
{
"role": "Bulky Attacker",
"movepool": ["Dragon Dance", "Drain Punch", "Knock Off", "Poison Jab"],
@ -4202,7 +4202,7 @@
"sets": [
{
"role": "Bulky Support",
"movepool": ["Brave Bird", "Defog", "Hydro Pump", "Knock Off", "Roost"],
"movepool": ["Brave Bird", "Defog", "Flip Turn", "Hydro Pump", "Knock Off", "Roost"],
"abilities": ["Hydration"],
"teraTypes": ["Ground"]
}
@ -4264,7 +4264,7 @@
"sets": [
{
"role": "Fast Support",
"movepool": ["Bug Buzz", "Giga Drain", "Sticky Web", "Thunder", "Volt Switch"],
"movepool": ["Bug Buzz", "Energy Ball", "Sticky Web", "Thunder", "Volt Switch"],
"abilities": ["Compound Eyes"],
"teraTypes": ["Electric"]
}
@ -4490,7 +4490,7 @@
},
{
"role": "Bulky Support",
"movepool": ["Body Press", "Iron Defense", "Iron Head", "Stealth Rock", "Stone Edge", "Thunder Wave", "Volt Switch"],
"movepool": ["Body Press", "Iron Defense", "Iron Head", "Stealth Rock", "Thunder Wave", "Volt Switch"],
"abilities": ["Justified"],
"teraTypes": ["Ghost", "Water"]
}
@ -5325,7 +5325,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["Close Combat", "Knock Off", "Stealth Rock", "Stone Edge", "Sucker Punch", "Swords Dance"],
"movepool": ["Close Combat", "Knock Off", "Play Rough", "Stealth Rock", "Stone Edge", "Sucker Punch", "Swords Dance"],
"abilities": ["No Guard"],
"teraTypes": ["Fighting"]
}
@ -5502,12 +5502,6 @@
"komala": {
"level": 89,
"sets": [
{
"role": "Fast Attacker",
"movepool": ["Double-Edge", "Earthquake", "Knock Off", "Superpower", "U-turn", "Wood Hammer"],
"abilities": ["Comatose"],
"teraTypes": ["Fighting", "Grass", "Ground"]
},
{
"role": "Bulky Support",
"movepool": ["Body Slam", "Earthquake", "Knock Off", "Rapid Spin", "U-turn"],
@ -5604,6 +5598,12 @@
"abilities": ["Prism Armor"],
"teraTypes": ["Dark", "Ground", "Steel"]
},
{
"role": "Bulky Setup",
"movepool": ["Dragon Dance", "Earthquake", "Knock Off", "Photon Geyser"],
"abilities": ["Prism Armor"],
"teraTypes": ["Dark", "Ground", "Steel"]
},
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Earth Power", "Heat Wave", "Moonlight", "Photon Geyser"],
@ -5622,7 +5622,7 @@
"teraTypes": ["Ground", "Steel", "Water"]
},
{
"role": "Setup Sweeper",
"role": "Bulky Setup",
"movepool": ["Dragon Dance", "Earthquake", "Photon Geyser", "Sunsteel Strike"],
"abilities": ["Prism Armor"],
"teraTypes": ["Ground", "Steel", "Water"]
@ -5659,7 +5659,7 @@
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Flash Cannon", "Fleur Cannon", "Shift Gear"],
"abilities": ["Soul-Heart"],
"teraTypes": ["Fairy", "Flying", "Steel", "Water"]
"teraTypes": ["Fairy", "Flying", "Water"]
},
{
"role": "Tera Blast user",
@ -6449,16 +6449,22 @@
"level": 79,
"sets": [
{
"role": "Fast Support",
"movepool": ["Aqua Step", "Close Combat", "Knock Off", "Rapid Spin", "Roost", "Triple Axel", "U-turn"],
"role": "Wallbreaker",
"movepool": ["Aqua Step", "Close Combat", "Knock Off", "Triple Axel", "U-turn"],
"abilities": ["Moxie"],
"teraTypes": ["Fighting", "Water"]
},
{
"role": "Setup Sweeper",
"movepool": ["Aqua Step", "Close Combat", "Encore", "Knock Off", "Roost", "Swords Dance", "Triple Axel"],
"movepool": ["Aqua Step", "Close Combat", "Encore", "Knock Off", "Swords Dance", "Triple Axel"],
"abilities": ["Moxie"],
"teraTypes": ["Fighting", "Water"]
"teraTypes": ["Fighting", "Steel", "Water"]
},
{
"role": "Bulky Attacker",
"movepool": ["Aqua Step", "Close Combat", "Rapid Spin", "Roost", "Swords Dance"],
"abilities": ["Moxie"],
"teraTypes": ["Steel"]
}
]
},
@ -6831,7 +6837,7 @@
"teraTypes": ["Water"]
},
{
"role": "Setup Sweeper",
"role": "Bulky Setup",
"movepool": ["Gigaton Hammer", "Knock Off", "Play Rough", "Protect", "Swords Dance"],
"abilities": ["Mold Breaker"],
"teraTypes": ["Steel"]

15
data/random-battles/gen9/teams.ts
View File

@ -816,6 +816,12 @@ export class RandomTeams {
}
}
// Enforce Encore on Whimsicott
if (movePool.includes('encore') && species.id === 'whimsicott') {
counter = this.addMove('encore', moves, types, abilities, teamDetails, species, isLead, isDoubles,
movePool, teraType, role);
}
// Enforce moves in doubles
if (isDoubles) {
const doublesEnforcedMoves = ['mortalspin', 'spore'];
@ -1176,7 +1182,7 @@ export class RandomTeams {
if (moves.has('clangoroussoul') || (species.id === 'toxtricity' && moves.has('shiftgear'))) return 'Throat Spray';
if (
(species.baseSpecies === 'Magearna' && role === 'Tera Blast user') ||
species.id === 'necrozmaduskmane' || (species.id === 'calyrexice' && isDoubles)
((species.id === 'calyrexice' || species.id === 'necrozmaduskmane') && isDoubles)
) return 'Weakness Policy';
if (['dragonenergy', 'lastrespects', 'waterspout'].some(m => moves.has(m))) return 'Choice Scarf';
if (
@ -1330,17 +1336,17 @@ export class RandomTeams {
teraType: string,
role: RandomTeamsTypes.Role,
): string {
const lifeOrbReqs = ['flamecharge', 'nuzzle', 'rapidspin', 'trailblaze'].every(m => !moves.has(m));
const lifeOrbReqs = ['flamecharge', 'nuzzle', 'rapidspin'].every(m => !moves.has(m));
if (
species.id !== 'jirachi' && (counter.get('Physical') >= moves.size) &&
['dragontail', 'fakeout', 'firstimpression', 'flamecharge', 'rapidspin'].every(m => !moves.has(m))
['dragontail', 'fakeout', 'firstimpression', 'flamecharge', 'rapidspin', 'trailblaze'].every(m => !moves.has(m))
) {
const scarfReqs = (
role !== 'Wallbreaker' &&
(species.baseStats.atk >= 100 || ability === 'Huge Power' || ability === 'Pure Power') &&
species.baseStats.spe >= 60 && species.baseStats.spe <= 108 &&
ability !== 'Speed Boost' && !counter.get('priority') && !moves.has('aquastep')
ability !== 'Speed Boost' && !counter.get('priority')
);
return (scarfReqs && this.randomChance(1, 2)) ? 'Choice Scarf' : 'Choice Band';
}
@ -1379,6 +1385,7 @@ export class RandomTeams {
) return 'Heavy-Duty Boots';
// Low Priority
if (moves.has('dragondance') && role === 'Bulky Setup') return 'Weakness Policy';
if (
ability === 'Rough Skin' || (
ability === 'Regenerator' && (role === 'Bulky Support' || role === 'Bulky Attacker') &&

2
data/random-battles/gen9ffa/sets.json
View File

@ -4782,7 +4782,7 @@
"teraTypes": ["Fairy"]
},
{
"role": "Fast Attacker",
"role": "Wallbreaker",
"movepool": ["Alluring Voice", "Dark Pulse", "Protect", "Psychic", "Thunderbolt"],
"abilities": ["Competitive"],
"teraTypes": ["Dark", "Electric", "Fairy"]