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 #9344

Merged
merged 3 commits into from Jan 23, 2023
Merged

Random Battles updates #9344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a9771a
Random Battles updates
ACakeWearingAHat Jan 22, 2023
3bbd6ef
cleanup
ACakeWearingAHat Jan 22, 2023
3f0bfdc
force freeze dry
ACakeWearingAHat Jan 22, 2023
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
43 changes: 24 additions & 19 deletions data/random-sets.json
View file
Open in desktop
Expand Up @@ -681,7 +681,7 @@
{
"role": "Bulky Support",
"movepool": ["Body Press", "Iron Head", "Rapid Spin", "Spikes", "Stealth Rock", "Volt Switch"],
"teraTypes": ["Fighting", "Water"]
"teraTypes": ["Water"]
}
]
},
Expand Down Expand Up @@ -786,7 +786,7 @@
{
"role": "Fast Attacker",
"movepool": ["Dark Pulse", "Fire Blast", "Nasty Plot", "Sludge Bomb", "Sucker Punch"],
"teraTypes": ["Dark", "Poison"]
"teraTypes": ["Dark", "Poison", "Fire"]
}
]
},
Expand All @@ -796,7 +796,7 @@
{
"role": "Bulky Support",
"movepool": ["Earthquake", "Ice Spinner", "Knock Off", "Rapid Spin", "Stealth Rock"],
"teraTypes": ["Dark", "Ground"]
"teraTypes": ["Grass", "Ghost"]
},
{
"role": "Bulky Attacker",
Expand Down Expand Up @@ -1626,12 +1626,12 @@
{
"role": "Setup Sweeper",
"movepool": ["Calm Mind", "Earth Power", "Ice Beam", "Judgment"],
"teraTypes": ["Bug", "Ground"]
"teraTypes": ["Ground"]
},
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Fire Blast", "Judgment", "Recover"],
"teraTypes": ["Bug", "Fire"]
"teraTypes": ["Fire"]
}
]
},
Expand All @@ -1641,7 +1641,7 @@
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Fire Blast", "Judgment", "Recover", "Sludge Bomb"],
"teraTypes": ["Dark"]
"teraTypes": ["Dark", "Poison", "Fire"]
}
]
},
Expand All @@ -1651,7 +1651,7 @@
{
"role": "Setup Sweeper",
"movepool": ["Earthquake", "Extreme Speed", "Gunk Shot", "Outrage", "Swords Dance"],
"teraTypes": ["Dragon"]
"teraTypes": ["Ground"]
}
]
},
Expand All @@ -1671,7 +1671,7 @@
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Earth Power", "Fire Blast", "Judgment", "Recover"],
"teraTypes": ["Fairy"]
"teraTypes": ["Fairy", "Ground", "Fire"]
}
]
},
Expand All @@ -1691,7 +1691,7 @@
{
"role": "Setup Sweeper",
"movepool": ["Earthquake", "Extreme Speed", "Flare Blitz", "Liquidation", "Recover", "Swords Dance"],
"teraTypes": ["Fire"]
"teraTypes": ["Fire", "Ground", "Water"]
}
]
},
Expand All @@ -1711,7 +1711,7 @@
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Focus Blast", "Judgment", "Recover"],
"teraTypes": ["Fighting"]
"teraTypes": ["Fighting", "Ghost"]
}
]
},
Expand Down Expand Up @@ -1746,7 +1746,7 @@
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Earth Power", "Judgment", "Recover", "Thunderbolt"],
"teraTypes": ["Electric", "Ice"]
"teraTypes": ["Electric", "Ground"]
}
]
},
Expand All @@ -1756,7 +1756,7 @@
{
"role": "Setup Sweeper",
"movepool": ["Earthquake", "Flare Blitz", "Gunk Shot", "Liquidation", "Recover", "Swords Dance"],
"teraTypes": ["Poison"]
"teraTypes": ["Poison", "Ground", "Fire", "Water"]
}
]
},
Expand Down Expand Up @@ -2299,7 +2299,7 @@
{
"role": "Bulky Support",
"movepool": ["Body Press", "Light Screen", "Moonblast", "Reflect", "Stealth Rock"],
"teraTypes": ["Fighting"]
"teraTypes": ["Water", "Steel"]
}
]
},
Expand Down Expand Up @@ -2419,7 +2419,7 @@
{
"role": "Bulky Attacker",
"movepool": ["Earth Power", "Flame Charge", "Flamethrower", "Sludge Bomb", "Steam Eruption"],
"teraTypes": ["Water", "Fire"]
"teraTypes": ["Water", "Fire", "Ground"]
}
]
},
Expand Down Expand Up @@ -2678,13 +2678,18 @@
"sets": [
{
"role": "Bulky Attacker",
"movepool": ["Aura Sphere", "Flash Cannon", "Fleur Cannon", "Ice Beam", "Spikes", "Volt Switch"],
"movepool": ["Aura Sphere", "Flash Cannon", "Fleur Cannon", "Ice Beam", "Pain Split", "Spikes", "Volt Switch"],
"teraTypes": ["Fairy", "Steel", "Fighting", "Water"]
},
{
"role": "Bulky Setup",
"movepool": ["Agility", "Calm Mind", "Flash Cannon", "Fleur Cannon"],
"teraTypes": ["Water", "Steel", "Fairy", "Flying"]
},
{
"role": "Tera Blast user",
"movepool": ["Fleur Cannon", "Iron Head", "Shift Gear", "Tera Blast", "Thunderbolt"],
"teraTypes": ["Ground"]
}
]
},
Expand Down Expand Up @@ -3298,8 +3303,8 @@
},
{
"role": "Bulky Setup",
"movepool": ["Boomburst", "Calm Mind", "Earth Power", "Roost", "Thunder"],
"teraTypes": ["Normal", "Ghost"]
"movepool": ["Boomburst", "Calm Mind", "Earth Power", "Roost", "Shadow Ball"],
"teraTypes": ["Ghost"]
}
]
},
Expand All @@ -3313,8 +3318,8 @@
},
{
"role": "Bulky Setup",
"movepool": ["Boomburst", "Calm Mind", "Earth Power", "Roost", "Thunder"],
"teraTypes": ["Normal", "Ghost"]
"movepool": ["Boomburst", "Calm Mind", "Earth Power", "Roost", "Shadow Ball"],
"teraTypes": ["Ghost"]
}
]
},
Expand Down
9 changes: 5 additions & 4 deletions data/random-teams.ts
View file
Open in desktop
Expand Up @@ -165,7 +165,7 @@ export class RandomTeams {
)
),
Ground: (movePool, moves, abilities, types, counter) => !counter.get('Ground'),
Ice: (movePool, moves, abilities, types, counter) => !counter.get('Ice'),
Ice: (movePool, moves, abilities, types, counter) => (movePool.includes('freezedry') || !counter.get('Ice')),
Normal: (movePool, moves, abilities, types, counter) => {
if (movePool.includes('boomburst')) return true;
return (!counter.get('Normal') && movePool.includes('futuresight'));
Expand All @@ -181,7 +181,7 @@ export class RandomTeams {
},
Rock: (movePool, moves, abilities, types, counter, species) => !counter.get('Rock') && species.baseStats.atk >= 80,
Steel: (movePool, moves, abilities, types, counter, species) => {
if (species.baseStats.atk < 95 && !movePool.includes('makeitrain')) return false;
if (species.baseStats.atk <= 95 && !movePool.includes('makeitrain')) return false;
return !counter.get('Steel');
},
Water: (movePool, moves, abilities, types, counter, species) => {
Expand Down Expand Up @@ -669,7 +669,7 @@ export class RandomTeams {
}

// Enforce Tera STAB
if (!counter.get('stabtera') && role !== "Bulky Support") {
if (!counter.get('stabtera') && role !== "Bulky Support" && species.baseSpecies !== 'Dudunsparce') {
const stabMoves = [];
for (const moveid of movePool) {
const move = this.dex.moves.get(moveid);
Expand Down Expand Up @@ -970,14 +970,14 @@ export class RandomTeams {
// Hard-code abilities here
if (species.id === 'arcaninehisui') return 'Rock Head';
if (species.id === 'staraptor') return 'Reckless';
if (species.id === 'vespiquen') return 'Pressure';
if (species.id === 'enamorus' && moves.has('calmmind')) return 'Cute Charm';
if (species.id === 'cetitan' && role === 'Wallbreaker') return 'Sheer Force';
if (abilities.has('Corrosion') && moves.has('toxic') && !moves.has('earthpower')) return 'Corrosion';
if (abilities.has('Cud Chew') && moves.has('substitute')) return 'Cud Chew';
if (abilities.has('Guts') && (moves.has('facade') || moves.has('sleeptalk'))) return 'Guts';
if (abilities.has('Harvest') && moves.has('substitute')) return 'Harvest';
if (species.id === 'hypno') return 'Insomnia';
if (abilities.has('Pressure') && role === 'Bulky Setup') return 'Pressure';
if (abilities.has('Serene Grace') && moves.has('headbutt')) return 'Serene Grace';
if (abilities.has('Technician') && counter.get('technician')) return 'Technician';
if (abilities.has('Own Tempo') && moves.has('petaldance')) return 'Own Tempo';
Expand Down Expand Up @@ -1055,6 +1055,7 @@ export class RandomTeams {
if (species.id === 'cyclizar' && role === 'Fast Attacker') return 'Choice Scarf';
if (species.id === 'lokix' && role === 'Wallbreaker') return 'Life Orb';
if (species.id === 'toxtricity' && moves.has('shiftgear')) return 'Throat Spray';
if (species.baseSpecies === 'Magearna' && moves.has('shiftgear')) return 'Weakness Policy';
if (ability === 'Imposter' || (species.id === 'magnezone' && moves.has('bodypress'))) return 'Choice Scarf';
if (moves.has('bellydrum') && moves.has('substitute')) return 'Salac Berry';
if (
Expand Down