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.

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

Random Battles: 2023-04 End-of-month changes #9544

Merged
merged 3 commits into from May 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
104 changes: 52 additions & 52 deletions data/mods/gen3/random-data.json
Expand Up @@ -12,7 +12,7 @@
"moves": ["earthquake", "icebeam", "mirrorcoat", "rest", "roar", "sleeptalk", "surf", "toxic"]
},
"butterfree": {
"level": 91,
"level": 92,
"moves": ["gigadrain", "hiddenpowerfire", "morningsun", "psychic", "sleeppowder", "stunspore", "toxic"]
},
"beedrill": {
Expand All @@ -28,7 +28,7 @@
"moves": ["endeavor", "hiddenpowerground", "quickattack", "return", "reversal", "shadowball", "substitute"]
},
"fearow": {
"level": 84,
"level": 85,
"moves": ["agility", "batonpass", "drillpeck", "hiddenpowerground", "quickattack", "return", "substitute"]
},
"arbok": {
Expand Down Expand Up @@ -72,7 +72,7 @@
"moves": ["aromatherapy", "hiddenpowerfire", "sleeppowder", "sludgebomb", "solarbeam", "sunnyday", "synthesis"]
},
"parasect": {
"level": 91,
"level": 92,
"moves": ["aromatherapy", "gigadrain", "hiddenpowerbug", "return", "spore", "stunspore", "swordsdance"]
},
"venomoth": {
Expand Down Expand Up @@ -132,11 +132,11 @@
"moves": ["calmmind", "fireblast", "icebeam", "psychic", "rest", "sleeptalk", "surf", "thunderwave"]
},
"magneton": {
"level": 81,
"level": 83,
"moves": ["hiddenpowergrass", "hiddenpowerice", "rest", "sleeptalk", "thunderbolt", "toxic"]
},
"farfetchd": {
"level": 91,
"level": 92,
"moves": ["agility", "batonpass", "hiddenpowerflying", "return", "swordsdance"]
},
"dodrio": {
Expand Down Expand Up @@ -196,31 +196,31 @@
"moves": ["explosion", "fireblast", "haze", "painsplit", "sludgebomb", "toxic", "willowisp"]
},
"rhydon": {
"level": 83,
"level": 84,
"moves": ["doubleedge", "earthquake", "megahorn", "rockslide", "substitute", "swordsdance"]
},
"tangela": {
"level": 90,
"moves": ["hiddenpowergrass", "leechseed", "morningsun", "sleeppowder", "stunspore"]
},
"kangaskhan": {
"level": 84,
"level": 82,
"moves": ["earthquake", "fakeout", "focuspunch", "rest", "return", "shadowball", "substitute", "toxic"]
},
"seaking": {
"level": 90,
"moves": ["hiddenpowergrass", "hydropump", "icebeam", "megahorn", "raindance"]
},
"starmie": {
"level": 79,
"level": 78,
"moves": ["hydropump", "icebeam", "psychic", "recover", "surf", "thunderbolt"]
},
"mrmime": {
"level": 84,
"moves": ["barrier", "batonpass", "calmmind", "encore", "firepunch", "hypnosis", "psychic", "substitute", "thunderbolt"]
},
"scyther": {
"level": 84,
"level": 81,
"moves": ["aerialace", "batonpass", "hiddenpowerground", "hiddenpowerrock", "quickattack", "silverwind", "swordsdance"]
},
"jynx": {
Expand All @@ -244,7 +244,7 @@
"moves": ["doubleedge", "earthquake", "hiddenpowerghost", "hiddenpowerrock", "return"]
},
"gyarados": {
"level": 79,
"level": 78,
"moves": ["doubleedge", "dragondance", "earthquake", "hiddenpowerflying", "hydropump", "taunt"]
},
"lapras": {
Expand Down Expand Up @@ -276,7 +276,7 @@
"moves": ["brickbreak", "doubleedge", "hiddenpowerground", "rockslide", "surf", "swordsdance"]
},
"aerodactyl": {
"level": 79,
"level": 78,
"moves": ["doubleedge", "earthquake", "hiddenpowerflying", "rockslide", "substitute"]
},
"snorlax": {
Expand All @@ -300,11 +300,11 @@
"moves": ["doubleedge", "dragondance", "earthquake", "flamethrower", "healbell", "hiddenpowerflying", "icebeam", "substitute"]
},
"mewtwo": {
"level": 73,
"level": 70,
"moves": ["calmmind", "flamethrower", "icebeam", "psychic", "recover", "substitute", "thunderbolt"]
},
"mew": {
"level": 76,
"level": 75,
"moves": ["calmmind", "explosion", "flamethrower", "icebeam", "psychic", "softboiled", "thunderbolt", "thunderwave", "transform"]
},
"meganium": {
Expand All @@ -328,7 +328,7 @@
"moves": ["hypnosis", "psychic", "reflect", "toxic", "whirlwind"]
},
"ledian": {
"level": 92,
"level": 93,
"moves": ["agility", "batonpass", "lightscreen", "reflect", "silverwind", "swordsdance", "toxic"]
},
"ariados": {
Expand Down Expand Up @@ -372,7 +372,7 @@
"moves": ["hiddenpowergrass", "hypnosis", "icebeam", "rest", "surf", "toxic"]
},
"jumpluff": {
"level": 83,
"level": 84,
"moves": ["encore", "hiddenpowerflying", "leechseed", "sleeppowder", "substitute", "toxic"]
},
"aipom": {
Expand All @@ -392,7 +392,7 @@
"moves": ["counter", "curse", "earthquake", "hiddenpowerrock", "icebeam", "rest", "surf", "toxic"]
},
"espeon": {
"level": 81,
"level": 80,
"moves": ["batonpass", "calmmind", "hiddenpowerfire", "morningsun", "psychic", "reflect"]
},
"umbreon": {
Expand All @@ -416,7 +416,7 @@
"moves": ["hiddenpowerpsychic"]
},
"wobbuffet": {
"level": 77,
"level": 78,
"moves": ["counter", "destinybond", "encore", "mirrorcoat"]
},
"girafarig": {
Expand Down Expand Up @@ -452,7 +452,7 @@
"moves": ["agility", "batonpass", "hiddenpowerground", "hiddenpowerrock", "morningsun", "silverwind", "steelwing", "swordsdance"]
},
"shuckle": {
"level": 91,
"level": 92,
"moves": ["encore", "rest", "toxic", "wrap"]
},
"heracross": {
Expand All @@ -468,23 +468,23 @@
"moves": ["earthquake", "focuspunch", "hiddenpowerghost", "return", "swordsdance"]
},
"magcargo": {
"level": 90,
"level": 91,
"moves": ["fireblast", "hiddenpowergrass", "rest", "sleeptalk", "toxic", "yawn"]
},
"piloswine": {
"level": 90,
"level": 88,
"moves": ["doubleedge", "earthquake", "icebeam", "protect", "rockslide", "toxic"]
},
"corsola": {
"level": 91,
"level": 92,
"moves": ["calmmind", "icebeam", "recover", "surf", "toxic"]
},
"octillery": {
"level": 88,
"moves": ["fireblast", "hiddenpowergrass", "icebeam", "rockblast", "surf", "thunderwave"]
},
"delibird": {
"level": 91,
"level": 92,
"moves": ["aerialace", "focuspunch", "hiddenpowerground", "icebeam", "quickattack"]
},
"mantine": {
Expand Down Expand Up @@ -532,19 +532,19 @@
"moves": ["aromatherapy", "calmmind", "icebeam", "seismictoss", "softboiled", "thunderbolt", "thunderwave", "toxic"]
},
"raikou": {
"level": 79,
"level": 77,
"moves": ["calmmind", "crunch", "hiddenpowergrass", "hiddenpowerice", "rest", "sleeptalk", "substitute", "thunderbolt"]
},
"entei": {
"level": 82,
"level": 81,
"moves": ["bodyslam", "calmmind", "fireblast", "flamethrower", "hiddenpowergrass", "hiddenpowerice", "solarbeam", "substitute", "sunnyday"]
},
"suicune": {
"level": 77,
"moves": ["calmmind", "icebeam", "rest", "sleeptalk", "substitute", "surf", "toxic"]
},
"tyranitar": {
"level": 79,
"level": 78,
"moves": ["dragondance", "earthquake", "fireblast", "focuspunch", "hiddenpowerbug", "icebeam", "pursuit", "rockslide", "substitute"]
},
"lugia": {
Expand All @@ -556,7 +556,7 @@
"moves": ["calmmind", "earthquake", "recover", "sacredfire", "substitute", "thunderbolt", "toxic"]
},
"celebi": {
"level": 79,
"level": 77,
"moves": ["batonpass", "calmmind", "healbell", "hiddenpowergrass", "leechseed", "psychic", "recover"]
},
"sceptile": {
Expand All @@ -580,11 +580,11 @@
"moves": ["bellydrum", "extremespeed", "flail", "hiddenpowerground", "shadowball", "substitute"]
},
"beautifly": {
"level": 91,
"level": 93,
"moves": ["hiddenpowerbug", "hiddenpowerflying", "morningsun", "stunspore", "substitute", "toxic"]
},
"dustox": {
"level": 91,
"level": 92,
"moves": ["hiddenpowerground", "lightscreen", "moonlight", "sludgebomb", "toxic", "whirlwind"]
},
"ludicolo": {
Expand All @@ -604,15 +604,15 @@
"moves": ["icebeam", "protect", "rest", "sleeptalk", "surf", "toxic"]
},
"gardevoir": {
"level": 82,
"level": 81,
"moves": ["calmmind", "firepunch", "hypnosis", "psychic", "substitute", "thunderbolt", "willowisp"]
},
"masquerain": {
"level": 90,
"moves": ["hydropump", "icebeam", "stunspore", "substitute", "toxic"]
},
"breloom": {
"level": 81,
"level": 82,
"moves": ["focuspunch", "hiddenpowerghost", "hiddenpowerrock", "leechseed", "machpunch", "skyuppercut", "spore", "substitute", "swordsdance"]
},
"vigoroth": {
Expand Down Expand Up @@ -652,7 +652,7 @@
"moves": ["knockoff", "recover", "seismictoss", "shadowball", "toxic"]
},
"mawile": {
"level": 91,
"level": 92,
"moves": ["batonpass", "brickbreak", "focuspunch", "hiddenpowersteel", "rockslide", "substitute", "swordsdance", "toxic"]
},
"aggron": {
Expand Down Expand Up @@ -680,11 +680,11 @@
"moves": ["batonpass", "icepunch", "tailglow", "thunderbolt"]
},
"illumise": {
"level": 90,
"level": 91,
"moves": ["batonpass", "encore", "icepunch", "substitute", "thunderwave", "wish"]
},
"roselia": {
"level": 90,
"level": 91,
"moves": ["aromatherapy", "gigadrain", "hiddenpowerfire", "spikes", "stunspore", "synthesis"]
},
"swalot": {
Expand All @@ -704,23 +704,23 @@
"moves": ["earthquake", "explosion", "fireblast", "rest", "rockslide", "sleeptalk", "toxic"]
},
"torkoal": {
"level": 88,
"level": 89,
"moves": ["explosion", "fireblast", "flamethrower", "hiddenpowergrass", "rest", "toxic", "yawn"]
},
"grumpig": {
"level": 84,
"moves": ["calmmind", "firepunch", "icywind", "psychic", "substitute", "taunt"]
},
"spinda": {
"level": 91,
"level": 92,
"moves": ["bodyslam", "encore", "focuspunch", "shadowball", "substitute", "teeterdance", "toxic"]
},
"flygon": {
"level": 80,
"moves": ["dragonclaw", "earthquake", "fireblast", "hiddenpowerbug", "rockslide", "substitute", "toxic"]
},
"cacturne": {
"level": 89,
"level": 90,
"moves": ["focuspunch", "hiddenpowerdark", "leechseed", "needlearm", "spikes", "substitute", "thunderpunch"]
},
"altaria": {
Expand All @@ -740,7 +740,7 @@
"moves": ["batonpass", "calmmind", "explosion", "hypnosis", "icebeam", "psychic"]
},
"solrock": {
"level": 84,
"level": 85,
"moves": ["earthquake", "explosion", "overheat", "reflect", "rockslide", "shadowball"]
},
"whiscash": {
Expand Down Expand Up @@ -776,11 +776,11 @@
"moves": ["brickbreak", "return", "shadowball", "thunderwave", "trick"]
},
"banette": {
"level": 84,
"level": 85,
"moves": ["destinybond", "endure", "hiddenpowerfighting", "knockoff", "shadowball", "willowisp"]
},
"dusclops": {
"level": 84,
"level": 85,
"moves": ["focuspunch", "icebeam", "painsplit", "rest", "shadowball", "sleeptalk", "substitute", "willowisp"]
},
"tropius": {
Expand All @@ -800,7 +800,7 @@
"moves": ["earthquake", "explosion", "icebeam", "spikes", "toxic"]
},
"walrein": {
"level": 84,
"level": 83,
"moves": ["encore", "hiddenpowergrass", "icebeam", "rest", "sleeptalk", "surf", "toxic"]
},
"huntail": {
Expand All @@ -816,11 +816,11 @@
"moves": ["doubleedge", "earthquake", "hiddenpowerflying", "rest", "rockslide", "sleeptalk", "toxic"]
},
"luvdisc": {
"level": 92,
"level": 94,
"moves": ["icebeam", "protect", "substitute", "surf", "sweetkiss", "toxic"]
},
"salamence": {
"level": 78,
"level": 77,
"moves": ["brickbreak", "dragondance", "earthquake", "fireblast", "hiddenpowerflying", "rockslide"]
},
"metagross": {
Expand All @@ -840,35 +840,35 @@
"moves": ["rest", "seismictoss", "sleeptalk", "toxic"]
},
"latias": {
"level": 76,
"moves": ["calmmind", "dragonclaw", "hiddenpowerfire", "recover", "refresh", "toxic"]
"level": 68,
"moves": ["calmmind", "dragonclaw", "hiddenpowerfire", "psychic", "recover"]
},
"latios": {
"level": 75,
"moves": ["calmmind", "dragonclaw", "hiddenpowerfire", "psychic", "recover", "thunderbolt"]
"level": 68,
"moves": ["calmmind", "dragonclaw", "hiddenpowerfire", "psychic", "recover"]
},
"kyogre": {
"level": 73,
"level": 70,
"moves": ["calmmind", "icebeam", "rest", "sleeptalk", "surf", "thunder"]
},
"groudon": {
"level": 73,
"level": 72,
"moves": ["earthquake", "hiddenpowerbug", "overheat", "rockslide", "substitute", "swordsdance", "thunderwave"]
},
"rayquaza": {
"level": 74,
"level": 73,
"moves": ["dragondance", "earthquake", "extremespeed", "hiddenpowerflying", "overheat", "rockslide"]
},
"jirachi": {
"level": 77,
"level": 76,
"moves": ["bodyslam", "calmmind", "firepunch", "icepunch", "protect", "psychic", "substitute", "thunderbolt", "wish"]
},
"deoxys": {
"level": 76,
"level": 74,
"moves": ["extremespeed", "firepunch", "icebeam", "psychoboost", "shadowball", "superpower"]
},
"deoxysattack": {
"level": 76,
"level": 75,
"moves": ["extremespeed", "firepunch", "psychoboost", "shadowball", "superpower"]
},
"deoxysdefense": {
Expand Down
1 change: 1 addition & 0 deletions data/mods/gen3/random-teams.ts
Expand Up @@ -246,6 +246,7 @@ export class RandomGen3Teams extends RandomGen4Teams {
// First, the high-priority items
if (species.name === 'Ditto') return this.sample(['Metal Powder', 'Quick Claw']);
if (species.name === 'Farfetch\u2019d') return 'Stick';
if (species.name === 'Latias' || species.name === 'Latios') return 'Soul Dew';
if (species.name === 'Marowak') return 'Thick Club';
if (species.name === 'Pikachu') return 'Light Ball';
if (species.name === 'Shedinja') return 'Lum Berry';
Expand Down