Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Random Battles updates #9207

Merged
merged 1 commit into from Dec 18, 2022
Merged

Random Battles updates #9207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 17 additions & 12 deletions data/random-sets.json
View file
Open in desktop
Expand Up @@ -585,8 +585,8 @@
"sets": [
{
"role": "Wallbreaker",
"movepool": ["Dazzling Gleam", "Earth Power", "Solar Beam", "Sunny Day"],
"teraTypes": ["Grass", "Ground"]
"movepool": ["Dazzling Gleam", "Earth Power", "Leaf Storm", "Sludge Bomb"],
"teraTypes": ["Grass", "Ground", "Fairy", "Poison"]
}
]
},
Expand Down Expand Up @@ -826,7 +826,7 @@
{
"role": "Bulky Setup",
"movepool": ["Crunch", "Dragon Dance", "Earthquake", "Fire Punch", "Stone Edge"],
"teraTypes": ["Rock"]
"teraTypes": ["Rock", "Ghost"]
},
{
"role": "Bulky Support",
Expand Down Expand Up @@ -1015,7 +1015,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["Earthquake", "Flamethrower", "Giga Drain", "Gunk Shot", "Switcheroo"],
"movepool": ["Earthquake", "Flamethrower", "Giga Drain", "Glare", "Gunk Shot", "Switcheroo"],
"teraTypes": ["Ground", "Fire", "Poison", "Grass"]
}
]
Expand Down Expand Up @@ -1135,7 +1135,7 @@
"sets": [
{
"role": "Fast Support",
"movepool": ["Brick Break", "Bug Bite", "Pounce", "Sticky Web", "Taunt"],
"movepool": ["Brick Break", "Pounce", "Sticky Web", "Taunt"],
"teraTypes": ["Bug", "Ghost"]
}
]
Expand Down Expand Up @@ -1306,7 +1306,7 @@
{
"role": "Bulky Support",
"movepool": ["Earthquake", "Slack Off", "Stealth Rock", "Stone Edge", "Whirlwind", "Yawn"],
"teraTypes": ["Ground", "Fairy"]
"teraTypes": ["Fairy", "Rock"]
}
]
},
Expand Down Expand Up @@ -1736,7 +1736,7 @@
]
},
"arceuspoison": {
"level": 80,
"level": 72,
"sets": [
{
"role": "Setup Sweeper",
Expand Down Expand Up @@ -1902,7 +1902,7 @@
"zoroarkhisui": {
"sets": [
{
"role": "Fast Attacker",
"role": "Wallbreaker",
"movepool": ["Bitter Malice", "Flamethrower", "Focus Blast", "Hyper Voice", "Nasty Plot", "Shadow Ball", "Trick", "U-turn"],
"teraTypes": ["Normal"]
}
Expand Down Expand Up @@ -3289,7 +3289,7 @@
{
"role": "Bulky Setup",
"movepool": ["Boomburst", "Calm Mind", "Earth Power", "Roost", "Thunder"],
"teraTypes": ["Normal"]
"teraTypes": ["Normal", "Ghost"]
}
]
},
Expand Down Expand Up @@ -3330,6 +3330,11 @@
"role": "Fast Attacker",
"movepool": ["Axe Kick", "First Impression", "Sucker Punch", "U-turn"],
"teraTypes": ["Bug"]
},
{
"role": "Setup Sweeper",
"movepool": ["Leech Life", "Sucker Punch", "Swords Dance", "Throat Chop"],
"teraTypes": ["Dark"]
}
]
},
Expand All @@ -3338,7 +3343,7 @@
"sets": [
{
"role": "Bulky Support",
"movepool": ["Earth Power", "Psychic", "Recover", "Revival Blessing", "Trick Room"],
"movepool": ["Bug Buzz", "Earth Power", "Psychic", "Revival Blessing", "Trick Room"],
"teraTypes": ["Steel"]
}
]
Expand Down Expand Up @@ -3803,7 +3808,7 @@
"sets": [
{
"role": "Bulky Support",
"movepool": ["Encore", "Light Screen", "Play Rough", "Protect", "Reflect", "Stealth Rock", "Thunder Wave", "Wish"],
"movepool": ["Encore", "Light Screen", "Play Rough", "Protect", "Reflect", "Thunder Wave", "Wish"],
"teraTypes": ["Fairy", "Steel"]
}
]
Expand Down Expand Up @@ -4048,7 +4053,7 @@
"sets": [
{
"role": "Bulky Support",
"movepool": ["Earth Power", "Giga Drain", "Knock Off", "Rapid Spin", "Spikes", "Spore", "Toxic", "Toxic Spikes"],
"movepool": ["Earth Power", "Giga Drain", "Knock Off", "Leaf Storm", "Rapid Spin", "Spore", "Toxic", "Toxic Spikes"],
"teraTypes": ["Ground", "Water"]
}
]
Expand Down
17 changes: 9 additions & 8 deletions data/random-teams.ts
View file
Open in desktop
Expand Up @@ -157,11 +157,12 @@ export class RandomTeams {
Fire: (movePool, moves, abilities, types, counter, species) => !counter.get('Fire'),
Flying: (movePool, moves, abilities, types, counter) => !counter.get('Flying'),
Ghost: (movePool, moves, abilities, types, counter) => !counter.get('Ghost'),
Grass: (movePool, moves, abilities, types, counter, species) => {
if (movePool.includes('leafstorm')) return true;
return !counter.get('Grass') &&
(species.baseStats.atk >= 100 || types.includes('Electric') || abilities.has('Seed Sower'));
},
Grass: (movePool, moves, abilities, types, counter, species) => (
!counter.get('Grass') && (
movePool.includes('leafstorm') || species.baseStats.atk >= 100 ||
types.includes('Electric') || abilities.has('Seed Sower')
)
),
Ground: (movePool, moves, abilities, types, counter) => !counter.get('Ground'),
Ice: (movePool, moves, abilities, types, counter) => !counter.get('Ice'),
Normal: (movePool, moves, abilities, types, counter) => (movePool.includes('boomburst')),
Expand Down Expand Up @@ -842,8 +843,8 @@ export class RandomTeams {
role: string,
): boolean {
if ([
'Battle Bond', 'Flare Boost', 'Gluttony', 'Harvest', 'Hydration', 'Ice Body', 'Immunity',
'Own Tempo', 'Quick Feet', 'Rain Dish', 'Snow Cloak', 'Steadfast', 'Steam Engine',
'Armor Tail', 'Battle Bond', 'Flare Boost', 'Gluttony', 'Harvest', 'Hydration', 'Ice Body',
'Immunity', 'Own Tempo', 'Quick Feet', 'Rain Dish', 'Snow Cloak', 'Steadfast', 'Steam Engine',
].includes(ability)) return true;

switch (ability) {
Expand Down Expand Up @@ -1204,7 +1205,7 @@ export class RandomTeams {
(species.baseStats.hp + species.baseStats.def + species.baseStats.spd) < 300
) return 'Focus Sash';
if (
role !== 'Fast Attacker' && role !== 'Tera Blast user' &&
role !== 'Fast Attacker' && role !== 'Tera Blast user' && ability !== 'Levitate' &&
this.dex.getEffectiveness('Ground', species) >= 2
) return 'Air Balloon';
if (['Bulky Attacker', 'Bulky Support', 'Bulky Setup'].some(m => role === (m))) return 'Leftovers';
Expand Down