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 updates (#9882)

Browse Source 
* Randomized format set updates

* jirachi stuff

* oopsie

* revert ribo for now
This commit is contained in:
ACakeWearingAHat 2023-11-05 16:30:25 -06:00 committed by GitHub
parent def35420ef
commit 1cb7479418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/mods/gen6/random-sets.json
View File

@ -5130,10 +5130,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},
@ -5143,10 +5139,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},
@ -5156,10 +5148,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},
@ -5169,10 +5157,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},

16
data/mods/gen7/random-sets.json
View File

@ -5467,10 +5467,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},
@ -5480,10 +5476,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},
@ -5493,10 +5485,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},
@ -5506,10 +5494,6 @@
{
"role": "Bulky Support",
"movepool": ["seedbomb", "shadowsneak", "synthesis", "willowisp"]
},
{
"role": "Staller",
"movepool": ["leechseed", "phantomforce", "substitute", "willowisp"]
}
]
},

49
data/random-sets.json
View File

@ -19,7 +19,7 @@
"sets": [
{
"role": "Fast Support",
"movepool": ["Earthquake", "Glare", "Gunk Shot", "Knock Off", "Sucker Punch", "Toxic Spikes"],
"movepool": ["Earthquake", "Glare", "Gunk Shot", "Knock Off", "Toxic Spikes"],
"teraTypes": ["Dark", "Ground"]
}
]
@ -331,6 +331,11 @@
"role": "Wallbreaker",
"movepool": ["Fire Blast", "Psyshock", "Sludge Bomb", "Trick", "Trick Room"],
"teraTypes": ["Poison", "Psychic"]
},
{
"role": "AV Pivot",
"movepool": ["Earthquake", "Fire Blast", "Psychic", "Shell Side Arm", "Slack Off", "Thunder Wave"],
"teraTypes": ["Dark", "Ground", "Poison"]
}
]
},
@ -476,11 +481,6 @@
"role": "Fast Attacker",
"movepool": ["Body Slam", "Close Combat", "Earthquake", "Rock Slide", "Zen Headbutt"],
"teraTypes": ["Fighting", "Ground", "Normal"]
},
{
"role": "Wallbreaker",
"movepool": ["Close Combat", "Double-Edge", "Earthquake", "Lash Out", "Stone Edge"],
"teraTypes": ["Fighting", "Ground", "Normal"]
}
]
},
@ -1465,7 +1465,7 @@
{
"role": "Bulky Support",
"movepool": ["Encore", "Heal Bell", "Knock Off", "Psychic", "Recover", "Taunt", "Thunder Wave"],
"teraTypes": ["Electric", "Poison", "Steel"]
"teraTypes": ["Dark", "Electric", "Poison", "Steel"]
},
{
"role": "Bulky Setup",
@ -1500,7 +1500,7 @@
{
"role": "Setup Sweeper",
"movepool": ["Dragon Dance", "Dual Wingbeat", "Earthquake", "Outrage", "Roost"],
"teraTypes": ["Dragon", "Flying", "Ground"]
"teraTypes": ["Dragon", "Ground", "Steel"]
}
]
},
@ -1552,9 +1552,19 @@
"jirachi": {
"level": 79,
"sets": [
{
"role": "Fast Support",
"movepool": ["Body Slam", "Future Sight", "Iron Head", "Protect", "Wish"],
"teraTypes": ["Water"]
},
{
"role": "Bulky Attacker",
"movepool": ["Body Slam", "Drain Punch", "Energy Ball", "Fire Punch", "Iron Head", "Psychic", "Stealth Rock", "U-turn"],
"teraTypes": ["Fighting", "Water"]
},
{
"role": "Bulky Support",
"movepool": ["Body Slam", "Fire Punch", "Healing Wish", "Iron Head", "Protect", "Stealth Rock", "U-turn", "Wish"],
"movepool": ["Fire Punch", "Healing Wish", "Iron Head", "Protect", "U-turn", "Wish"],
"teraTypes": ["Water"]
}
]
@ -2179,7 +2189,7 @@
"sets": [
{
"role": "Fast Attacker",
"movepool": ["Defog", "Draco Meteor", "Dragon Tail", "Earthquake", "Outrage", "Poltergeist", "Shadow Sneak", "Will-O-Wisp"],
"movepool": ["Defog", "Draco Meteor", "Dragon Tail", "Earthquake", "Poltergeist", "Shadow Sneak", "Will-O-Wisp"],
"teraTypes": ["Dragon", "Ghost"]
}
]
@ -2768,7 +2778,7 @@
"level": 83,
"sets": [
{
"role": "Fast Attacker",
"role": "Wallbreaker",
"movepool": ["High Jump Kick", "Knock Off", "Poison Jab", "Stone Edge", "U-turn"],
"teraTypes": ["Dark"]
},
@ -3055,7 +3065,7 @@
{
"role": "Bulky Attacker",
"movepool": ["Draco Meteor", "Flip Turn", "Focus Blast", "Hydro Pump", "Sludge Bomb", "Toxic", "Toxic Spikes"],
"teraTypes": ["Fighting", "Water"]
"teraTypes": ["Water"]
}
]
},
@ -3732,11 +3742,6 @@
"hatterene": {
"level": 87,
"sets": [
{
"role": "Wallbreaker",
"movepool": ["Dazzling Gleam", "Mystical Fire", "Psychic", "Psyshock", "Trick", "Trick Room"],
"teraTypes": ["Fairy", "Fire", "Psychic"]
},
{
"role": "Bulky Setup",
"movepool": ["Calm Mind", "Draining Kiss", "Mystical Fire", "Psychic", "Psyshock"],
@ -4437,11 +4442,6 @@
"movepool": ["Gunk Shot", "Knock Off", "Super Fang", "U-turn"],
"teraTypes": ["Dark"]
},
{
"role": "Bulky Support",
"movepool": ["Encore", "Knock Off", "Protect", "Substitute", "Toxic"],
"teraTypes": ["Dark"]
},
{
"role": "Fast Support",
"movepool": ["Encore", "Gunk Shot", "Knock Off", "Parting Shot"],
@ -4501,6 +4501,11 @@
"role": "Fast Attacker",
"movepool": ["Energy Ball", "Flamethrower", "Leaf Storm", "Overheat"],
"teraTypes": ["Fire", "Grass"]
},
{
"role": "Wallbreaker",
"movepool": ["Energy Ball", "Fire Blast", "Stomping Tantrum", "Sunny Day"],
"teraTypes": ["Fire", "Grass", "Ground"]
}
]
},

19
data/random-teams.ts
View File

@ -170,10 +170,7 @@ export class RandomTeams {
this.moveEnforcementCheckers = {
Bug: (movePool) => (movePool.includes('megahorn') || movePool.includes('xscissor')),
Dark: (movePool, moves, abilities, types, counter) => !counter.get('Dark'),
Dragon: (movePool, moves, abilities, types, counter, species, teamDetails, isLead, isDoubles) => (
!counter.get('Dragon') &&
(!movePool.includes('dualwingbeat') || isDoubles)
),
Dragon: (movePool, moves, abilities, types, counter) => !counter.get('Dragon'),
Electric: (movePool, moves, abilities, types, counter) => !counter.get('Electric'),
Fairy: (movePool, moves, abilities, types, counter) => !counter.get('Fairy'),
Fighting: (movePool, moves, abilities, types, counter) => !counter.get('Fighting'),
@ -196,7 +193,7 @@ export class RandomTeams {
Psychic: (movePool, moves, abilities, types, counter) => {
if (counter.get('Psychic')) return false;
if (movePool.includes('calmmind') || movePool.includes('psychicfangs')) return true;
return abilities.has('Psychic Surge') || types.includes('Fire') || types.includes('Electric') || types.includes('Fighting');
return abilities.has('Psychic Surge') || ['Electric', 'Fighting', 'Fire', 'Poison'].some(m => types.includes(m));
},
Rock: (movePool, moves, abilities, types, counter, species) => !counter.get('Rock') && species.baseStats.atk >= 80,
Steel: (movePool, moves, abilities, types, counter, species, teamDetails, isLead, isDoubles) => (
@ -579,7 +576,6 @@ export class RandomTeams {
if (species.id === "dugtrio") this.incompatibleMoves(moves, movePool, statusMoves, 'memento');
if (species.id === "cyclizar") this.incompatibleMoves(moves, movePool, 'taunt', 'knockoff');
if (species.baseSpecies === 'Dudunsparce') this.incompatibleMoves(moves, movePool, 'earthpower', 'shadowball');
if (species.id === 'jirachi') this.incompatibleMoves(moves, movePool, 'bodyslam', 'healingwish');
if (species.id === 'mesprit') this.incompatibleMoves(moves, movePool, 'healingwish', 'uturn');
}
@ -735,12 +731,6 @@ export class RandomTeams {
movePool, teraType, role);
}
// Enforce Toxic on Grafaiai
if (movePool.includes('toxic') && species.id === 'grafaiai') {
counter = this.addMove('toxic', moves, types, abilities, teamDetails, species, isLead, isDoubles,
movePool, teraType, role);
}
// Enforce Trick Room on Doubles Wallbreaker
if (movePool.includes('trickroom') && role === 'Doubles Wallbreaker') {
counter = this.addMove('trickroom', moves, types, abilities, teamDetails, species, isLead, isDoubles,
@ -1060,7 +1050,7 @@ export class RandomTeams {
case 'Reckless':
return !counter.get('recoil');
case 'Regenerator':
return (species.id === 'mienshao' && role === 'Fast Attacker');
return (species.id === 'mienshao' && role === 'Wallbreaker');
case 'Rock Head':
return !counter.get('recoil');
case 'Sand Force': case 'Sand Rush':
@ -1139,10 +1129,11 @@ export class RandomTeams {
if (species.id === 'golemalola' && moves.has('doubleedge')) return 'Galvanize';
if (abilities.has('Guts') && (moves.has('facade') || moves.has('sleeptalk') || species.id === 'gurdurr')) return 'Guts';
if (species.id === 'copperajah' && moves.has('heavyslam')) return 'Heavy Metal';
if (species.id === 'ariados') return 'Insomnia';
if (species.id === 'cetitan' && (role === 'Wallbreaker' || isDoubles)) return 'Sheer Force';
if (species.id === 'dipplin') return 'Sticky Hold';
if (species.id === 'breloom') return 'Technician';
if (species.id === 'shiftry' && moves.has('tailwind')) return 'Wind Rider';
if (species.id === 'dipplin') return 'Sticky Hold';
// singles
if (!isDoubles) {