Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-04-25 07:22:09 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Gen 9 Random Battle updates (#9786)

Browse Source
This commit is contained in:
ACakeWearingAHat 2023-09-16 16:30:46 -05:00 committed by GitHub
parent 2998cfb33b
commit 81357ff4e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
data/random-sets.json
View File

@ -439,7 +439,7 @@
"sets": [
{
"role": "Bulky Attacker",
"movepool": ["Fire Blast", "Gunk Shot", "Pain Split", "Toxic Spikes", "Will-O-Wisp"],
"movepool": ["Fire Blast", "Gunk Shot", "Pain Split", "Sludge Bomb", "Toxic Spikes", "Will-O-Wisp"],
"teraTypes": ["Steel"]
}
]
@ -836,11 +836,6 @@
"role": "Wallbreaker",
"movepool": ["Dazzling Gleam", "Earth Power", "Leaf Storm", "Sludge Bomb"],
"teraTypes": ["Fairy", "Grass", "Ground", "Poison"]
},
{
"role": "Setup Sweeper",
"movepool": ["Giga Drain", "Sludge Bomb", "Sunny Day", "Weather Ball"],
"teraTypes": ["Fire"]
}
]
},
@ -1550,7 +1545,7 @@
{
"role": "Setup Sweeper",
"movepool": ["Headlong Rush", "Shell Smash", "Stone Edge", "Wood Hammer"],
"teraTypes": ["Ground", "Water"]
"teraTypes": ["Ground", "Rock", "Water"]
}
]
},
@ -5032,8 +5027,13 @@
"sets": [
{
"role": "AV Pivot",
"movepool": ["Brave Bird", "Gunk Shot", "Heat Wave", "Play Rough", "U-turn"],
"teraTypes": ["Flying", "Ground"]
"movepool": ["Beat Up", "Gunk Shot", "Heat Wave", "Play Rough", "U-turn"],
"teraTypes": ["Dark", "Steel", "Water"]
},
{
"role": "Bulky Attacker",
"movepool": ["Beat Up", "Double Kick", "Gunk Shot", "Play Rough", "Roost", "U-turn"],
"teraTypes": ["Dark", "Steel", "Water"]
},
{
"role": "Tera Blast user",
@ -5050,11 +5050,6 @@
"movepool": ["Ivy Cudgel", "Knock Off", "Spikes", "Superpower", "Synthesis", "U-turn"],
"teraTypes": ["Grass"]
},
{
"role": "Wallbreaker",
"movepool": ["Knock Off", "Superpower", "U-turn", "Wood Hammer"],
"teraTypes": ["Grass"]
},
{
"role": "Setup Sweeper",
"movepool": ["Ivy Cudgel", "Knock Off", "Superpower", "Swords Dance"],
@ -5066,7 +5061,7 @@
"level": 80,
"sets": [
{
"role": "Fast Support",
"role": "Bulky Attacker",
"movepool": ["Encore", "Ivy Cudgel", "Spikes", "Synthesis", "U-turn", "Wood Hammer"],
"teraTypes": ["Water"]
},
@ -5091,7 +5086,7 @@
"level": 80,
"sets": [
{
"role": "Fast Support",
"role": "Bulky Attacker",
"movepool": ["Encore", "Ivy Cudgel", "Spikes", "Superpower", "Synthesis", "Wood Hammer"],
"teraTypes": ["Rock"]
},

10
data/random-teams.ts
View File

@ -534,7 +534,7 @@ export class RandomTeams {
['fireblast', ['fierydance', 'flamethrower']],
['lavaplume', 'magmastorm'],
['thunderpunch', 'wildcharge'],
['gunkshot', ['direclaw', 'poisonjab']],
['gunkshot', ['direclaw', 'poisonjab', 'sludgebomb']],
['aurasphere', 'focusblast'],
['closecombat', 'drainpunch'],
['bugbite', 'pounce'],
@ -1291,7 +1291,7 @@ export class RandomTeams {
if (moves.has('scaleshot')) return 'Loaded Dice';
if (moves.has('stuffcheeks')) return this.randomChance(1, 2) ? 'Liechi Berry' : 'Salac Berry';
if (ability === 'Unburden') return moves.has('closecombat') ? 'White Herb' : 'Sitrus Berry';
if (moves.has('shellsmash')) return 'White Herb';
if (moves.has('shellsmash') && ability !== 'Weak Armor') return 'White Herb';
if (moves.has('acrobatics') && ability !== 'Protosynthesis') return ability === 'Grassy Surge' ? 'Grassy Seed' : '';
if (moves.has('auroraveil') || moves.has('lightscreen') && moves.has('reflect')) return 'Light Clay';
if (
@ -1424,6 +1424,7 @@ export class RandomTeams {
return 'Assault Vest';
}
if (counter.get('speedsetup') && role === 'Bulky Setup') return 'Weakness Policy';
if (species.id === 'golem') return 'Custap Berry';
if (species.id === 'urshifurapidstrike') return 'Punching Glove';
if (species.id === 'palkia') return 'Lustrous Orb';
if (moves.has('substitute') || ability === 'Moody') return 'Leftovers';
@ -1709,6 +1710,9 @@ export class RandomTeams {
// Limit to one of each species (Species Clause)
if (baseFormes[species.baseSpecies]) continue;
// Treat Ogerpon formes like the Tera Blast user role; reject if team has one already
if (species.baseSpecies === 'Ogerpon' && teamDetails.teraBlast) continue;
// Illusion shouldn't be on the last slot
if (species.baseSpecies === 'Zoroark' && pokemon.length >= (this.maxTeamSize - 1)) continue;
@ -1846,7 +1850,7 @@ export class RandomTeams {
if (set.moves.includes('auroraveil') || (set.moves.includes('reflect') && set.moves.includes('lightscreen'))) {
teamDetails.screens = 1;
}
if (set.role === 'Tera Blast user') teamDetails.teraBlast = 1;
if (set.role === 'Tera Blast user' || species.baseSpecies === "Ogerpon") teamDetails.teraBlast = 1;
}
if (pokemon.length < this.maxTeamSize && pokemon.length < 12) { // large teams sometimes cannot be built
throw new Error(`Could not build a random team for ${this.format} (seed=${seed})`);