Skip to content

Commit

Permalink
rm isMegaRayquazaAllowed functionality (#13)
Browse files Browse the repository at this point in the history 
https://github.com/smogon/usage-stats/blob/e90871a5/batchLogReader.py#L167C2-L167C13
  • Loading branch information
@scheibo
scheibo committed Sep 20, 2024
1 parent eaf3cf5 commit 9bf5520
Show file tree
Hide file tree
Showing 20 changed files with 69 additions and 81 deletions.
6 changes: 1 addition & 5 deletions stats/src/parser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ export const Parser = new class {
team: Array<PokemonSet & {forcedLevel?: number}>,
legacy = false,
) {
const mray = util.isMegaRayquazaAllowed(format);
gen = util.ignoreGen(gen, legacy);
for (const pokemon of team) {
const item = pokemon.item && gen.items.get(pokemon.item);
Expand Down Expand Up @@ -316,10 +315,7 @@ export const Parser = new class {
pokemon.species =
util.getSpecies(gen, util.fromAlias(pokemon.species || pokemon.name), legacy).id;
pokemon.teraType = pokemon.teraType || 'nothing';
if (mray && pokemon.species === 'rayquaza' && pokemon.moves.includes('dragonascent')) {
pokemon.species = 'rayquazamega';
pokemon.ability = 'deltastream';
} else if (pokemon.species === 'greninja' && pokemon.ability === 'battlebond') {
if (pokemon.species === 'greninja' && pokemon.ability === 'battlebond') {
pokemon.species = 'greninjaash';
} else if (pokemon.species === 'zacian' && pokemon.item === 'rustedsword') {
pokemon.species = 'zaciancrowned';
Expand Down
2 changes: 1 addition & 1 deletion stats/src/test/testdata/reports/gen7anythinggoes/detailed.0.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":{"metagame":"gen7anythinggoes","cutoff":0,"cutoff deviation":0,"team type":null,"number of battles":1},"data":{"Darmanitan":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"zenmode":1},"Items":{"assaultvest":1},"Tera Types":{"nothing":1},"Spreads":{"Modest:251/0/0/252/4/0":1},"Happiness":{"255":1},"Moves":{"fireblast":1,"flamethrower":1,"psychic":1,"uturn":1},"Teammates":{"Dugtrio":1,"Gastrodon":1,"Mimikyu":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Rayquaza-Mega":[1,1,0]}},"Ditto":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"imposter":1},"Items":{"nothing":1},"Tera Types":{"nothing":1},"Spreads":{"Impish:248/8/252/0/0/0":1},"Happiness":{"255":1},"Moves":{"":3,"transform":1},"Teammates":{"Greninja-Ash":1,"Meloetta":1,"Rayquaza-Mega":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{"Gastrodon":[1,0,0],"Mimikyu":[1,0,0],"Shaymin-Sky":[1,0,0],"Zygarde":[1,0,0]}},"Dugtrio":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"arenatrap":1},"Items":{"choiceband":1},"Tera Types":{"nothing":1},"Spreads":{"Hasty:0/252/0/4/0/252":1},"Happiness":{"255":1},"Moves":{"earthquake":1,"hiddenpowergrass":1,"stoneedge":1,"suckerpunch":1},"Teammates":{"Darmanitan":1,"Gastrodon":1,"Mimikyu":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Greninja-Ash":[1,1,0]}},"Gastrodon":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"stormdrain":1},"Items":{"ejectbutton":1},"Tera Types":{"nothing":1},"Spreads":{"Sassy:252/4/0/0/252/0":1},"Happiness":{"255":1},"Moves":{"earthquake":1,"icebeam":1,"recover":1,"surf":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Mimikyu":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[1,1,0]}},"Greninja-Ash":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"battlebond":1},"Items":{"lifeorb":1},"Tera Types":{"nothing":1},"Spreads":{"Timid:0/0/0/252/4/252":1},"Happiness":{"255":1},"Moves":{"hiddenpowerghost":1,"spikes":1,"uturn":1,"watershuriken":1},"Teammates":{"Ditto":1,"Meloetta":1,"Rayquaza-Mega":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{"Mimikyu":[1,1,0],"Dugtrio":[1,0,0],"Gastrodon":[1,0,0],"Shaymin-Sky":[2,0,0],"Zygarde":[1,0,0]}},"Meloetta":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"serenegrace":1},"Items":{"redcard":1},"Tera Types":{"nothing":1},"Spreads":{"Timid:0/0/0/252/4/252":1},"Happiness":{"255":1},"Moves":{"focusblast":1,"perishsong":1,"relicsong":1,"signalbeam":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Rayquaza-Mega":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{}},"Mimikyu":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"disguise":1},"Items":{"lifeorb":1},"Tera Types":{"nothing":1},"Spreads":{"Jolly:0/252/0/0/4/252":1},"Happiness":{"255":1},"Moves":{"destinybond":1,"playrough":1,"shadowsneak":1,"swordsdance":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Gastrodon":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[1,0,0]}},"Rayquaza-Mega":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"deltastream":1},"Items":{"ejectbutton":1},"Tera Types":{"nothing":1},"Spreads":{"Adamant:0/252/0/0/4/252":1},"Happiness":{"255":1},"Moves":{"dragonascent":1,"dragondance":1,"extremespeed":1,"roar":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Meloetta":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{"Darmanitan":[1,0,0]}},"Shaymin-Sky":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"serenegrace":1},"Items":{"nothing":1},"Tera Types":{"nothing":1},"Spreads":{"Timid:0/0/0/252/4/252":1},"Happiness":{"255":1},"Moves":{"airslash":1,"dazzlinggleam":1,"grassknot":1,"hiddenpowerelectric":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Gastrodon":1,"Mimikyu":1,"Zygarde":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[2,1,0]}},"Shedinja":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"wonderguard":1},"Items":{"focussash":1},"Tera Types":{"nothing":1},"Spreads":{"Naive:0/196/0/4/0/232":1},"Happiness":{"255":1},"Moves":{"facade":1,"hiddenpowerdark":1,"":1,"swordsdance":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Meloetta":1,"Rayquaza-Mega":1,"Zoroark":1},"Checks and Counters":{}},"Zoroark":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"illusion":1},"Items":{"lifeorb":1},"Tera Types":{"nothing":1},"Spreads":{"Jolly:0/252/0/0/4/252":1},"Happiness":{"0":1},"Moves":{"frustration":1,"knockoff":1,"pursuit":1,"uturn":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Meloetta":1,"Rayquaza-Mega":1,"Shedinja":1},"Checks and Counters":{}},"Zygarde":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"powerconstruct":1},"Items":{"assaultvest":1},"Tera Types":{"nothing":1},"Spreads":{"Careful:252/4/0/0/252/0":1},"Happiness":{"255":1},"Moves":{"brickbreak":1,"dragontail":1,"glare":1,"thousandarrows":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Gastrodon":1,"Mimikyu":1,"Shaymin-Sky":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[1,1,0]}}}}
{"info":{"metagame":"gen7anythinggoes","cutoff":0,"cutoff deviation":0,"team type":null,"number of battles":1},"data":{"Darmanitan":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"zenmode":1},"Items":{"assaultvest":1},"Tera Types":{"nothing":1},"Spreads":{"Modest:251/0/0/252/4/0":1},"Happiness":{"255":1},"Moves":{"fireblast":1,"flamethrower":1,"psychic":1,"uturn":1},"Teammates":{"Dugtrio":1,"Gastrodon":1,"Mimikyu":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Rayquaza":[1,1,0]}},"Ditto":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"imposter":1},"Items":{"nothing":1},"Tera Types":{"nothing":1},"Spreads":{"Impish:248/8/252/0/0/0":1},"Happiness":{"255":1},"Moves":{"":3,"transform":1},"Teammates":{"Greninja-Ash":1,"Meloetta":1,"Rayquaza":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{"Gastrodon":[1,0,0],"Mimikyu":[1,0,0],"Shaymin-Sky":[1,0,0],"Zygarde":[1,0,0]}},"Dugtrio":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"arenatrap":1},"Items":{"choiceband":1},"Tera Types":{"nothing":1},"Spreads":{"Hasty:0/252/0/4/0/252":1},"Happiness":{"255":1},"Moves":{"earthquake":1,"hiddenpowergrass":1,"stoneedge":1,"suckerpunch":1},"Teammates":{"Darmanitan":1,"Gastrodon":1,"Mimikyu":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Greninja-Ash":[1,1,0]}},"Gastrodon":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"stormdrain":1},"Items":{"ejectbutton":1},"Tera Types":{"nothing":1},"Spreads":{"Sassy:252/4/0/0/252/0":1},"Happiness":{"255":1},"Moves":{"earthquake":1,"icebeam":1,"recover":1,"surf":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Mimikyu":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[1,1,0]}},"Greninja-Ash":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"battlebond":1},"Items":{"lifeorb":1},"Tera Types":{"nothing":1},"Spreads":{"Timid:0/0/0/252/4/252":1},"Happiness":{"255":1},"Moves":{"hiddenpowerghost":1,"spikes":1,"uturn":1,"watershuriken":1},"Teammates":{"Ditto":1,"Meloetta":1,"Rayquaza":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{"Mimikyu":[1,1,0],"Dugtrio":[1,0,0],"Gastrodon":[1,0,0],"Shaymin-Sky":[2,0,0],"Zygarde":[1,0,0]}},"Meloetta":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"serenegrace":1},"Items":{"redcard":1},"Tera Types":{"nothing":1},"Spreads":{"Timid:0/0/0/252/4/252":1},"Happiness":{"255":1},"Moves":{"focusblast":1,"perishsong":1,"relicsong":1,"signalbeam":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Rayquaza":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{}},"Mimikyu":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"disguise":1},"Items":{"lifeorb":1},"Tera Types":{"nothing":1},"Spreads":{"Jolly:0/252/0/0/4/252":1},"Happiness":{"255":1},"Moves":{"destinybond":1,"playrough":1,"shadowsneak":1,"swordsdance":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Gastrodon":1,"Shaymin-Sky":1,"Zygarde":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[1,0,0]}},"Rayquaza":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"airlock":1},"Items":{"ejectbutton":1},"Tera Types":{"nothing":1},"Spreads":{"Adamant:0/252/0/0/4/252":1},"Happiness":{"255":1},"Moves":{"dragonascent":1,"dragondance":1,"extremespeed":1,"roar":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Meloetta":1,"Shedinja":1,"Zoroark":1},"Checks and Counters":{"Darmanitan":[1,0,0]}},"Shaymin-Sky":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"serenegrace":1},"Items":{"nothing":1},"Tera Types":{"nothing":1},"Spreads":{"Timid:0/0/0/252/4/252":1},"Happiness":{"255":1},"Moves":{"airslash":1,"dazzlinggleam":1,"grassknot":1,"hiddenpowerelectric":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Gastrodon":1,"Mimikyu":1,"Zygarde":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[2,1,0]}},"Shedinja":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"wonderguard":1},"Items":{"focussash":1},"Tera Types":{"nothing":1},"Spreads":{"Naive:0/196/0/4/0/232":1},"Happiness":{"255":1},"Moves":{"facade":1,"hiddenpowerdark":1,"":1,"swordsdance":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Meloetta":1,"Rayquaza":1,"Zoroark":1},"Checks and Counters":{}},"Zoroark":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,43,43,43],"Abilities":{"illusion":1},"Items":{"lifeorb":1},"Tera Types":{"nothing":1},"Spreads":{"Jolly:0/252/0/0/4/252":1},"Happiness":{"0":1},"Moves":{"frustration":1,"knockoff":1,"pursuit":1,"uturn":1},"Teammates":{"Ditto":1,"Greninja-Ash":1,"Meloetta":1,"Rayquaza":1,"Shedinja":1},"Checks and Counters":{}},"Zygarde":{"Raw count":1,"usage":0.5,"Viability Ceiling":[1,88,88,88],"Abilities":{"powerconstruct":1},"Items":{"assaultvest":1},"Tera Types":{"nothing":1},"Spreads":{"Careful:252/4/0/0/252/0":1},"Happiness":{"255":1},"Moves":{"brickbreak":1,"dragontail":1,"glare":1,"thousandarrows":1},"Teammates":{"Darmanitan":1,"Dugtrio":1,"Gastrodon":1,"Mimikyu":1,"Shaymin-Sky":1},"Checks and Counters":{"Ditto":[1,1,0],"Greninja-Ash":[1,1,0]}}}}
Loading

0 comments on commit 9bf5520

Please sign in to comment.