Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-05 21:17:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Gen 7 Random Battle Updates (#9153)

Browse Source
This commit is contained in:
Alexander B 2022-12-16 19:59:23 -06:00 committed by GitHub
parent 70d32406ad
commit 9d555fb2c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
data/mods/gen7/formats-data.ts
View File

@ -6,7 +6,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
venusaur: {
randomBattleMoves: ["leafstorm", "leechseed", "sleeppowder", "sludgebomb", "substitute"],
randomBattleMoves: ["gigadrain", "leechseed", "sleeppowder", "sludgebomb", "substitute"],
randomDoubleBattleMoves: ["gigadrain", "hiddenpowerfire", "hiddenpowerice", "powerwhip", "protect", "sleeppowder", "sludgebomb"],
tier: "RU",
doublesTier: "(DUU)",
@ -151,7 +151,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
pikachu: {
randomBattleMoves: ["grassknot", "hiddenpowerice", "irontail", "knockoff", "voltswitch", "volttackle"],
randomBattleMoves: ["extremespeed", "grassknot", "hiddenpowerice", "irontail", "knockoff", "voltswitch", "volttackle"],
randomDoubleBattleMoves: ["encore", "fakeout", "grassknot", "hiddenpowerice", "knockoff", "protect", "voltswitch", "volttackle"],
tier: "NFE",
},
@ -360,7 +360,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "(DUU)",
},
persianalola: {
randomBattleMoves: ["darkpulse", "hiddenpowerfighting", "hypnosis", "nastyplot", "powergem"],
randomBattleMoves: ["darkpulse", "hypnosis", "nastyplot", "powergem", "thunderbolt"],
randomDoubleBattleMoves: ["fakeout", "foulplay", "hiddenpowerfighting", "icywind", "partingshot", "protect", "snarl"],
tier: "PU",
doublesTier: "(DUU)",
@ -387,7 +387,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
arcanine: {
randomBattleMoves: ["closecombat", "crunch", "extremespeed", "flareblitz", "morningsun", "roar", "toxic", "wildcharge", "willowisp"],
randomBattleMoves: ["closecombat", "extremespeed", "flareblitz", "morningsun", "roar", "toxic", "wildcharge", "willowisp"],
randomDoubleBattleMoves: ["closecombat", "extremespeed", "flareblitz", "protect", "snarl", "wildcharge", "willowisp"],
tier: "RU",
doublesTier: "DUU",
@ -417,7 +417,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
alakazam: {
randomBattleMoves: ["focusblast", "hiddenpowerfire", "hiddenpowerice", "psychic", "psyshock", "shadowball"],
randomBattleMoves: ["focusblast", "hiddenpowerfire", "psychic", "psyshock", "shadowball"],
randomDoubleBattleMoves: ["dazzlinggleam", "encore", "focusblast", "protect", "psychic", "shadowball"],
tier: "UUBL",
doublesTier: "(DUU)",
@ -635,7 +635,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
electrode: {
randomBattleMoves: ["foulplay", "hiddenpowergrass", "signalbeam", "taunt", "thunderbolt", "voltswitch"],
randomBattleMoves: ["foulplay", "hiddenpowergrass", "hiddenpowerice", "signalbeam", "taunt", "thunderbolt", "voltswitch"],
randomDoubleBattleMoves: ["foulplay", "protect", "taunt", "thunderbolt", "thunderwave", "voltswitch"],
tier: "(PU)",
doublesTier: "(DUU)",
@ -717,12 +717,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
rhydon: {
randomBattleMoves: ["earthquake", "megahorn", "rockblast", "stealthrock", "stoneedge", "toxic"],
randomBattleMoves: ["earthquake", "megahorn", "stealthrock", "stoneedge", "toxic"],
tier: "NU",
doublesTier: "NFE",
},
rhyperior: {
randomBattleMoves: ["dragontail", "earthquake", "icepunch", "megahorn", "rockblast", "rockpolish", "stoneedge"],
randomBattleMoves: ["dragontail", "earthquake", "icepunch", "megahorn", "rockpolish", "stoneedge"],
randomDoubleBattleMoves: ["earthquake", "icepunch", "megahorn", "protect", "rockslide", "stealthrock", "stoneedge"],
tier: "RU",
doublesTier: "(DUU)",
@ -737,7 +737,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "NFE",
},
blissey: {
randomBattleMoves: ["flamethrower", "healbell", "protect", "seismictoss", "softboiled", "stealthrock", "toxic"],
randomBattleMoves: ["healbell", "seismictoss", "softboiled", "stealthrock", "toxic"],
randomDoubleBattleMoves: ["helpinghand", "protect", "seismictoss", "softboiled", "thunderwave", "toxic"],
tier: "UU",
doublesTier: "(DUU)",
@ -780,7 +780,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
seaking: {
randomBattleMoves: ["drillrun", "icebeam", "knockoff", "megahorn", "scald", "waterfall"],
randomBattleMoves: ["drillrun", "icebeam", "knockoff", "megahorn", "raindance", "waterfall"],
randomDoubleBattleMoves: ["drillrun", "icywind", "knockoff", "megahorn", "protect", "waterfall"],
tier: "(PU)",
doublesTier: "(DUU)",
@ -888,7 +888,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DUU",
},
lapras: {
randomBattleMoves: ["healbell", "hydropump", "icebeam", "substitute", "thunderbolt", "toxic"],
randomBattleMoves: ["freezedry", "healbell", "hydropump", "icebeam", "protect", "thunderbolt", "toxic"],
randomDoubleBattleMoves: ["freezedry", "helpinghand", "hydropump", "iceshard", "icywind", "protect"],
tier: "(PU)",
doublesTier: "(DUU)",
@ -962,7 +962,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
omastar: {
randomBattleMoves: ["earthpower", "hydropump", "icebeam", "scald", "shellsmash", "spikes", "stealthrock"],
randomBattleMoves: ["earthpower", "hydropump", "icebeam", "shellsmash", "spikes", "stealthrock"],
randomDoubleBattleMoves: ["earthpower", "hiddenpowerelectric", "hydropump", "icebeam", "muddywater", "protect", "shellsmash"],
tier: "PU",
doublesTier: "(DUU)",
@ -1148,7 +1148,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
xatu: {
randomBattleMoves: ["calmmind", "heatwave", "psychic", "reflect", "roost", "thunderwave", "toxic", "uturn"],
randomBattleMoves: ["calmmind", "heatwave", "psychic", "roost", "thunderwave", "toxic", "uturn"],
randomDoubleBattleMoves: ["heatwave", "protect", "psychic", "roost", "tailwind", "thunderwave", "uturn"],
tier: "NU",
doublesTier: "(DUU)",
@ -1456,7 +1456,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "(DUU)",
},
raikou: {
randomBattleMoves: ["aurasphere", "calmmind", "extrasensory", "hiddenpowerice", "substitute", "thunderbolt", "voltswitch"],
randomBattleMoves: ["aurasphere", "calmmind", "hiddenpowerice", "substitute", "thunderbolt", "voltswitch"],
randomDoubleBattleMoves: ["calmmind", "hiddenpowerice", "protect", "snarl", "thunderbolt"],
tier: "RU",
doublesTier: "(DUU)",
@ -1516,7 +1516,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
sceptile: {
randomBattleMoves: ["focusblast", "gigadrain", "hiddenpowerflying", "hiddenpowerice", "leafstorm"],
randomBattleMoves: ["focusblast", "gigadrain", "hiddenpowerfire", "hiddenpowerice", "leafstorm", "leechseed", "substitute"],
randomDoubleBattleMoves: ["energyball", "focusblast", "hiddenpowerfire", "hiddenpowerice", "protect"],
tier: "NU",
doublesTier: "(DUU)",
@ -1787,13 +1787,13 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
aggron: {
randomBattleMoves: ["aquatail", "autotomize", "earthquake", "headsmash", "heavyslam", "lowkick", "stealthrock"],
randomBattleMoves: ["aquatail", "autotomize", "earthquake", "headsmash", "heavyslam", "stealthrock"],
randomDoubleBattleMoves: ["headsmash", "heavyslam", "protect", "stealthrock", "stompingtantrum"],
tier: "PU",
doublesTier: "(DUU)",
},
aggronmega: {
randomBattleMoves: ["earthquake", "heavyslam", "roar", "rockslide", "stealthrock", "thunderwave", "toxic"],
randomBattleMoves: ["earthquake", "heavyslam", "roar", "stealthrock", "stoneedge", "thunderwave", "toxic"],
randomDoubleBattleMoves: ["heavyslam", "protect", "rockslide", "stealthrock", "stompingtantrum", "toxic"],
tier: "UU",
doublesTier: "(DUU)",
@ -1983,7 +1983,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "(DUU)",
},
lunatone: {
randomBattleMoves: ["earthpower", "icebeam", "moonlight", "powergem", "psychic", "rockpolish", "stealthrock", "toxic"],
randomBattleMoves: ["earthpower", "icebeam", "moonblast", "moonlight", "powergem", "psychic", "rockpolish", "stealthrock", "toxic"],
randomDoubleBattleMoves: ["earthpower", "helpinghand", "powergem", "protect", "psychic", "trickroom"],
tier: "(PU)",
doublesTier: "(DUU)",
@ -2043,7 +2043,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
milotic: {
randomBattleMoves: ["dragontail", "icebeam", "recover", "rest", "scald", "sleeptalk", "toxic"],
randomBattleMoves: ["dragontail", "icebeam", "recover", "scald", "toxic"],
randomDoubleBattleMoves: ["hypnosis", "icywind", "protect", "recover", "scald"],
tier: "RU",
doublesTier: "DOU",
@ -2266,7 +2266,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DUber",
},
kyogreprimal: {
randomBattleMoves: ["calmmind", "icebeam", "originpulse", "rest", "scald", "sleeptalk", "thunder", "toxic"],
randomBattleMoves: ["calmmind", "icebeam", "originpulse", "rest", "scald", "sleeptalk", "thunder"],
randomDoubleBattleMoves: ["calmmind", "icebeam", "originpulse", "protect", "thunder"],
tier: "Uber",
doublesTier: "DUber",
@ -2343,7 +2343,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
infernape: {
randomBattleMoves: ["closecombat", "fireblast", "flareblitz", "focusblast", "grassknot", "nastyplot", "stealthrock", "stoneedge", "uturn", "vacuumwave"],
randomBattleMoves: ["closecombat", "fireblast", "flareblitz", "focusblast", "grassknot", "nastyplot", "stealthrock", "stoneedge", "swordsdance", "uturn", "vacuumwave"],
randomDoubleBattleMoves: ["closecombat", "fakeout", "feint", "flareblitz", "grassknot", "heatwave", "protect", "stoneedge", "taunt", "uturn"],
tier: "UU",
doublesTier: "(DUU)",
@ -2601,7 +2601,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
drapion: {
randomBattleMoves: ["aquatail", "earthquake", "knockoff", "poisonjab", "swordsdance", "taunt", "toxicspikes", "whirlwind"],
randomBattleMoves: ["aquatail", "earthquake", "knockoff", "poisonjab", "pursuit", "swordsdance", "taunt", "toxicspikes", "whirlwind"],
randomDoubleBattleMoves: ["aquatail", "knockoff", "poisonjab", "protect", "snarl", "swordsdance", "taunt"],
tier: "RU",
doublesTier: "(DUU)",
@ -2724,7 +2724,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "(DUU)",
},
giratina: {
randomBattleMoves: ["calmmind", "dracometeor", "rest", "roar", "shadowball", "sleeptalk", "willowisp"],
randomBattleMoves: ["calmmind", "dragonpulse", "rest", "roar", "shadowball", "sleeptalk", "willowisp"],
randomDoubleBattleMoves: ["calmmind", "dragonpulse", "dragontail", "protect", "shadowball", "tailwind", "willowisp"],
tier: "Uber",
doublesTier: "DUber",
@ -2979,7 +2979,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
gigalith: {
randomBattleMoves: ["earthquake", "explosion", "rockblast", "stealthrock", "stoneedge", "superpower"],
randomBattleMoves: ["earthquake", "explosion", "stealthrock", "stoneedge", "superpower"],
randomDoubleBattleMoves: ["protect", "rockslide", "stealthrock", "stompingtantrum", "stoneedge", "superpower", "wideguard"],
tier: "RU",
doublesTier: "(DUU)",
@ -3136,7 +3136,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
crustle: {
randomBattleMoves: ["earthquake", "rockblast", "shellsmash", "spikes", "stealthrock", "stoneedge", "xscissor"],
randomBattleMoves: ["earthquake", "shellsmash", "spikes", "stealthrock", "stoneedge", "xscissor"],
randomDoubleBattleMoves: ["earthquake", "protect", "rockslide", "shellsmash", "stoneedge", "xscissor"],
tier: "(PU)",
doublesTier: "(DUU)",
@ -3283,7 +3283,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
amoonguss: {
randomBattleMoves: ["clearsmog", "foulplay", "gigadrain", "hiddenpowerfire", "sludgebomb", "spore", "stunspore", "synthesis"],
randomBattleMoves: ["clearsmog", "foulplay", "gigadrain", "hiddenpowerfire", "sludgebomb", "spore", "synthesis"],
randomDoubleBattleMoves: ["gigadrain", "hiddenpowerfire", "protect", "ragepowder", "sludgebomb", "spore", "stunspore"],
tier: "UU",
doublesTier: "DOU",
@ -3500,7 +3500,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DOU",
},
cobalion: {
randomBattleMoves: ["closecombat", "hiddenpowerice", "ironhead", "stealthrock", "stoneedge", "swordsdance", "voltswitch"],
randomBattleMoves: ["closecombat", "ironhead", "stealthrock", "stoneedge", "swordsdance", "voltswitch"],
randomDoubleBattleMoves: ["closecombat", "ironhead", "protect", "stoneedge", "swordsdance", "thunderwave"],
tier: "UU",
doublesTier: "(DUU)",
@ -3512,7 +3512,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DOU",
},
virizion: {
randomBattleMoves: ["calmmind", "focusblast", "gigadrain", "hiddenpowerice", "hiddenpowerrock"],
randomBattleMoves: ["closecombat", "leafblade", "stoneedge", "swordsdance"],
randomDoubleBattleMoves: ["closecombat", "leafblade", "protect", "stoneedge", "swordsdance", "taunt"],
tier: "RU",
doublesTier: "(DUU)",
@ -3578,7 +3578,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DOU",
},
kyuremwhite: {
randomBattleMoves: ["dracometeor", "dragonpulse", "earthpower", "focusblast", "fusionflare", "icebeam", "roost", "substitute", "toxic"],
randomBattleMoves: ["dracometeor", "earthpower", "focusblast", "fusionflare", "icebeam", "roost", "substitute", "toxic"],
randomDoubleBattleMoves: ["dracometeor", "dragonpulse", "earthpower", "fusionflare", "icebeam", "protect", "roost"],
tier: "Uber",
doublesTier: "DUber",
@ -3594,7 +3594,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "(DUU)",
},
meloetta: {
randomBattleMoves: ["calmmind", "focusblast", "hypervoice", "psyshock", "shadowball", "uturn"],
randomBattleMoves: ["calmmind", "focusblast", "hypervoice", "psyshock", "shadowball", "trick", "uturn"],
randomDoubleBattleMoves: ["calmmind", "focusblast", "hypervoice", "protect", "psyshock", "shadowball"],
tier: "RUBL",
doublesTier: "(DUU)",
@ -3783,7 +3783,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "NFE",
},
aegislash: {
randomBattleMoves: ["flashcannon", "hiddenpowerice", "kingsshield", "shadowball", "shadowsneak"],
randomBattleMoves: ["flashcannon", "hiddenpowerice", "kingsshield", "shadowball", "shadowsneak", "toxic"],
randomDoubleBattleMoves: ["flashcannon", "hiddenpowerice", "kingsshield", "shadowball", "shadowsneak"],
tier: "Uber",
doublesTier: "DOU",
@ -3904,7 +3904,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
goodra: {
randomBattleMoves: ["dracometeor", "dragontail", "earthquake", "fireblast", "sludgebomb", "thunderbolt"],
randomBattleMoves: ["dracometeor", "dragontail", "earthquake", "fireblast", "powerwhip", "sludgebomb", "thunderbolt"],
randomDoubleBattleMoves: ["dracometeor", "dragonpulse", "fireblast", "muddywater", "powerwhip", "protect", "thunderbolt"],
tier: "RU",
doublesTier: "(DUU)",
@ -4007,7 +4007,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DUber",
},
diancie: {
randomBattleMoves: ["diamondstorm", "hiddenpowerfire", "lightscreen", "moonblast", "reflect", "stealthrock"],
randomBattleMoves: ["diamondstorm", "earthpower", "lightscreen", "moonblast", "reflect", "stealthrock"],
randomDoubleBattleMoves: ["calmmind", "dazzlinggleam", "diamondstorm", "earthpower", "moonblast", "protect"],
tier: "RU",
doublesTier: "DOU",
@ -4043,7 +4043,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
decidueye: {
randomBattleMoves: ["leafblade", "roost", "spiritshackle", "suckerpunch", "swordsdance", "uturn"],
randomBattleMoves: ["leafblade", "roost", "shadowsneak", "spiritshackle", "swordsdance", "uturn"],
randomDoubleBattleMoves: ["bravebird", "leafblade", "protect", "spiritshackle", "suckerpunch"],
tier: "NU",
doublesTier: "(DUU)",
@ -4067,7 +4067,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
primarina: {
randomBattleMoves: ["hiddenpowerfire", "hydropump", "moonblast", "psychic", "scald"],
randomBattleMoves: ["energyball", "hiddenpowerfire", "hydropump", "moonblast", "psychic", "scald"],
randomDoubleBattleMoves: ["hypervoice", "icebeam", "moonblast", "protect", "psychic"],
tier: "UU",
doublesTier: "(DUU)",
@ -4150,7 +4150,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "NFE",
},
ribombee: {
randomBattleMoves: ["bugbuzz", "hiddenpowerfire", "moonblast", "quiverdance", "roost"],
randomBattleMoves: ["bugbuzz", "hiddenpowerfire", "moonblast", "quiverdance", "roost", "stickyweb"],
randomDoubleBattleMoves: ["moonblast", "pollenpuff", "protect", "quiverdance", "stickyweb"],
tier: "RU",
doublesTier: "(DUU)",
@ -4239,7 +4239,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
tier: "LC",
},
shiinotic: {
randomBattleMoves: ["leechseed", "moonblast", "spore", "strengthsap", "substitute"],
randomBattleMoves: ["gigadrain", "leechseed", "moonblast", "spore", "strengthsap"],
randomDoubleBattleMoves: ["gigadrain", "leechseed", "moonblast", "protect", "spore", "strengthsap"],
tier: "(PU)",
doublesTier: "(DUU)",
@ -4291,7 +4291,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
doublesTier: "DUU",
},
passimian: {
randomBattleMoves: ["closecombat", "earthquake", "ironhead", "knockoff", "rockslide", "uturn"],
randomBattleMoves: ["closecombat", "earthquake", "gunkshot", "knockoff", "rockslide", "uturn"],
randomDoubleBattleMoves: ["closecombat", "knockoff", "protect", "rockslide", "taunt", "uturn"],
tier: "NU",
doublesTier: "(DUU)",

8
data/mods/gen7/random-teams.ts
View File

@ -297,13 +297,7 @@ export class RandomGen7Teams extends RandomGen8Teams {
(abilities.has('Speed Boost') && moves.has('protect')) ||
(abilities.has('Protean') && counter.get('Status') > 2) ||
!!counter.setupType ||
!!counter.get('speedsetup') || (
types.has('Bug') &&
counter.get('stab') < 2 &&
counter.damagingMoves.size > 2 &&
!abilities.has('Adaptability') &&
!abilities.has('Download')
)
!!counter.get('speedsetup')
)};
case 'voltswitch':
return {cull: (