diff --git a/config/formats.js b/config/formats.js index df285ae1d2..0c093a7602 100644 --- a/config/formats.js +++ b/config/formats.js @@ -32,7 +32,7 @@ exports.Formats = [ section: "ORAS Singles", ruleset: ['Pokemon', 'Standard', 'Team Preview', 'Swagger Clause', 'Baton Pass Clause'], - banlist: ['Uber', 'Soul Dew', 'Gengarite', 'Kangaskhanite', 'Lucarionite', 'Mawilite', 'Salamencite'] + banlist: ['Uber', 'Soul Dew'] }, { name: "OU (no Mega)", @@ -69,9 +69,7 @@ exports.Formats = [ section: "ORAS Singles", ruleset: ['OU'], - banlist: ['OU', 'BL', 'Alakazite', 'Altarianite', 'Diancite', 'Heracronite', 'Galladite', 'Gardevoirite', 'Lopunnite', 'Medichamite', - 'Metagrossite', 'Pidgeotite', 'Pinsirite', 'Drizzle', 'Drought', 'Shadow Tag' - ] + banlist: ['OU', 'BL', 'Drizzle', 'Drought', 'Shadow Tag'] }, { name: "RU", @@ -83,7 +81,7 @@ exports.Formats = [ section: "ORAS Singles", ruleset: ['UU'], - banlist: ['UU', 'BL2', 'Galladite', 'Houndoominite', 'Pidgeotite'] + banlist: ['UU', 'BL2'] }, { name: "NU", @@ -95,7 +93,7 @@ exports.Formats = [ section: "ORAS Singles", ruleset: ['RU'], - banlist: ['RU', 'BL3', 'Cameruptite', 'Glalitite', 'Steelixite'] + banlist: ['RU', 'BL3'] }, { name: "LC", @@ -785,7 +783,7 @@ exports.Formats = [ section: "Other Metagames", ruleset: ['NU'], - banlist: ['NU', 'BL4', 'Altarianite', 'Beedrillite', 'Lopunnite', 'Chatter', 'Shell Smash + Baton Pass'] + banlist: ['NU', 'BL4', 'Chatter', 'Shell Smash + Baton Pass'] }, { name: "Inverse Battle", diff --git a/data/formats-data.js b/data/formats-data.js index e0d28f4496..bd212cc613 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -19,12 +19,13 @@ exports.BattleFormatsData = { venusaur: { randomBattleMoves: ["sunnyday","sleeppowder","gigadrain","hiddenpowerfire","sludgebomb","leechseed","substitute"], randomDoubleBattleMoves: ["sleeppowder","gigadrain","hiddenpowerfire","hiddenpowerice","sludgebomb","powerwhip","protect"], - tier: "OU" + tier: "(OU)" }, venusaurmega: { randomBattleMoves: ["sleeppowder","gigadrain","hiddenpowerfire","sludgebomb","leechseed","synthesis","earthquake","knockoff"], randomDoubleBattleMoves: ["sleeppowder","gigadrain","hiddenpowerfire","hiddenpowerice","sludgebomb","powerwhip","protect"], - requiredItem: "Venusaurite" + requiredItem: "Venusaurite", + tier: "OU" }, charmander: { randomBattleMoves: ["flamethrower","overheat","dragonpulse","hiddenpowergrass","fireblast"], @@ -55,17 +56,19 @@ exports.BattleFormatsData = { {"generation":6,"level":36,"gender":"M","isHidden":false,"moves":["firefang","airslash","dragonclaw","dragonrage"],"pokeball":"cherishball"}, {"generation":6,"level":36,"shiny":true,"gender":"M","isHidden":false,"moves":["overheat","solarbeam","focusblast","holdhands"],"pokeball":"cherishball"} ], - tier: "OU" + tier: "(OU)" }, charizardmegax: { randomBattleMoves: ["dragondance","flareblitz","dragonclaw","earthquake","roost","willowisp"], randomDoubleBattleMoves: ["dragondance","flareblitz","dragonclaw","earthquake","rockslide","roost","substitute"], - requiredItem: "Charizardite X" + requiredItem: "Charizardite X", + tier: "OU" }, charizardmegay: { randomBattleMoves: ["fireblast","airslash","roost","solarbeam","focusblast","dragonpulse"], randomDoubleBattleMoves: ["heatwave","fireblast","airslash","roost","solarbeam","focusblast","protect"], - requiredItem: "Charizardite Y" + requiredItem: "Charizardite Y", + tier: "OU" }, squirtle: { randomBattleMoves: ["icebeam","hydropump","rapidspin","scald","aquajet","toxic"], @@ -89,12 +92,13 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":3,"level":70,"moves":["protect","raindance","skullbash","hydropump"]} ], - tier: "UU" + tier: "(UU)" }, blastoisemega: { randomBattleMoves: ["icebeam","hydropump","rapidspin","scald","toxic","dragontail","darkpulse","aurasphere"], randomDoubleBattleMoves: ["muddywater","icebeam","hydropump","fakeout","scald","darkpulse","aurasphere","followme","icywind","protect"], - requiredItem: "Blastoisinite" + requiredItem: "Blastoisinite", + tier: "UU" }, caterpie: { randomBattleMoves: ["bugbite","snore","tackle","electroweb"], @@ -126,12 +130,13 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":3,"level":30,"moves":["batonpass","sludgebomb","twineedle","swordsdance"]} ], - tier: "UU" + tier: "(UU)" }, beedrillmega: { randomBattleMoves: ["xscissor","swordsdance","uturn","poisonjab","drillrun","knockoff"], randomDoubleBattleMoves: ["xscissor","uturn","substitute","poisonjab","drillrun","knockoff","protect"], - requiredItem: "Beedrillite" + requiredItem: "Beedrillite", + tier: "UU" }, pidgey: { randomBattleMoves: ["roost","bravebird","heatwave","return","workup","uturn","thief"], @@ -604,7 +609,8 @@ exports.BattleFormatsData = { alakazammega: { randomBattleMoves: ["calmmind","psyshock","focusblast","shadowball","encore","substitute"], randomDoubleBattleMoves: ["protect","psychic","psyshock","focusblast","shadowball","encore","substitute","dazzlinggleam"], - requiredItem: "Alakazite" + requiredItem: "Alakazite", + tier: "(OU)" }, machop: { randomBattleMoves: ["dynamicpunch","bulkup","icepunch","rockslide","bulletpunch","knockoff"], @@ -703,7 +709,8 @@ exports.BattleFormatsData = { slowbromega: { randomBattleMoves: ["calmmind","scald","psyshock","slackoff","fireblast","psychic","icebeam","grassknot"], randomDoubleBattleMoves: ["scald","fireblast","icebeam","psychic","grassknot","thunderwave","slackoff","trickroom","protect","psyshock"], - requiredItem: "Slowbronite" + requiredItem: "Slowbronite", + tier: "(OU)" }, slowking: { randomBattleMoves: ["scald","fireblast","icebeam","psychic","grassknot","thunderwave","toxic","slackoff","trickroom","nastyplot","dragontail","psyshock"], @@ -833,12 +840,13 @@ exports.BattleFormatsData = { steelix: { randomBattleMoves: ["stealthrock","earthquake","ironhead","roar","toxic","rockslide"], randomDoubleBattleMoves: ["stealthrock","earthquake","ironhead","rockslide","protect","explosion"], - tier: "RU" + tier: "(RU)" }, steelixmega: { randomBattleMoves: ["stealthrock","earthquake","heavyslam","roar","toxic","dragontail"], randomDoubleBattleMoves: ["stealthrock","earthquake","heavyslam","rockslide","protect","explosion"], - requiredItem: "Steelixite" + requiredItem: "Steelixite", + tier: "RU" }, drowzee: { randomBattleMoves: ["psychic","seismictoss","thunderwave","wish","protect","toxic","shadowball","trickroom","calmmind","dazzlinggleam"], @@ -1125,7 +1133,8 @@ exports.BattleFormatsData = { scizormega: { randomBattleMoves: ["swordsdance","roost","bulletpunch","bugbite","superpower","uturn","batonpass","pursuit","defog","knockoff"], randomDoubleBattleMoves: ["swordsdance","roost","bulletpunch","bugbite","superpower","uturn","protect","feint","knockoff"], - requiredItem: "Scizorite" + requiredItem: "Scizorite", + tier: "OU" }, smoochum: { randomBattleMoves: ["icebeam","psychic","hiddenpowerfighting","trick","shadowball","grassknot"], @@ -1242,7 +1251,8 @@ exports.BattleFormatsData = { gyaradosmega: { randomBattleMoves: ["dragondance","waterfall","earthquake","substitute","icefang","crunch"], randomDoubleBattleMoves: ["dragondance","waterfall","earthquake","bounce","taunt","protect","thunderwave","stoneedge","substitute","icefang"], - requiredItem: "Gyaradosite" + requiredItem: "Gyaradosite", + tier: "(OU)" }, lapras: { randomBattleMoves: ["icebeam","thunderbolt","healbell","toxic","hydropump","substitute"], @@ -1379,12 +1389,13 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":15,"gender":"M","isHidden":false,"abilities":["pressure"],"moves":["steelwing","icefang","firefang","thunderfang"],"pokeball":"cherishball"} ], - tier: "UU" + tier: "(UU)" }, aerodactylmega: { randomBattleMoves: ["aquatail","defog","honeclaws","stoneedge","firefang","icefang","aerialace","roost"], randomDoubleBattleMoves: ["wideguard","taunt","stoneedge","rockslide","earthquake","ironhead","aerialace","protect","icefang","skydrop","tailwind"], - requiredItem: "Aerodactylite" + requiredItem: "Aerodactylite", + tier: "UU" }, munchlax: { randomBattleMoves: ["rest","curse","sleeptalk","bodyslam","earthquake","return","firepunch","icepunch","whirlwind","toxic"], @@ -1465,11 +1476,13 @@ exports.BattleFormatsData = { }, mewtwomegax: { randomBattleMoves: ["bulkup","drainpunch","earthquake","taunt","stoneedge","zenheadbutt","icebeam"], - requiredItem: "Mewtwonite X" + requiredItem: "Mewtwonite X", + tier: "Uber" }, mewtwomegay: { randomBattleMoves: ["psystrike","aurasphere","shadowball","fireblast","icebeam","calmmind","recover","willowisp","taunt"], - requiredItem: "Mewtwonite Y" + requiredItem: "Mewtwonite Y", + tier: "Uber" }, mew: { randomBattleMoves: ["defog","roost","willowisp","knockoff","taunt","icebeam","earthpower","aurasphere","stealthrock","nastyplot","psyshock","batonpass"], @@ -1651,12 +1664,13 @@ exports.BattleFormatsData = { ampharos: { randomBattleMoves: ["voltswitch","reflect","lightscreen","focusblast","thunderbolt","toxic","healbell","hiddenpowerice"], randomDoubleBattleMoves: ["focusblast","hiddenpowerice","hiddenpowergrass","thunderbolt","discharge","dragonpulse","protect"], - tier: "UU" + tier: "(UU)" }, ampharosmega: { randomBattleMoves: ["voltswitch","focusblast","agility","thunderbolt","healbell","dragonpulse"], randomDoubleBattleMoves: ["focusblast","hiddenpowerice","hiddenpowergrass","thunderbolt","discharge","dragonpulse","protect"], - requiredItem: "Ampharosite" + requiredItem: "Ampharosite", + tier: "UU" }, azurill: { randomBattleMoves: ["scald","return","bodyslam","encore","toxic","protect","knockoff"], @@ -2076,7 +2090,8 @@ exports.BattleFormatsData = { tyranitarmega: { randomBattleMoves: ["crunch","stoneedge","earthquake","icepunch","dragondance"], randomDoubleBattleMoves: ["crunch","stoneedge","earthquake","icepunch","dragondance","rockslide","protect"], - requiredItem: "Tyranitarite" + requiredItem: "Tyranitarite", + tier: "(OU)" }, lugia: { randomBattleMoves: ["toxic","roost","substitute","whirlwind","thunderwave","dragontail","aeroblast"], @@ -2132,12 +2147,13 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":50,"isHidden":false,"moves":["leafstorm","dragonpulse","focusblast","rockslide"],"pokeball":"cherishball"} ], - tier: "UU" + tier: "(UU)" }, sceptilemega: { randomBattleMoves: ["substitute","gigadrain","dragonpulse","focusblast","swordsdance","outrage","leafblade","earthquake","hiddenpowerfire"], randomDoubleBattleMoves: ["substitute","gigadrain","leafstorm","hiddenpowerice","focusblast","dragonpulse","hiddenpowerfire","protect"], - requiredItem: "Sceptilite" + requiredItem: "Sceptilite", + tier: "UU" }, torchic: { randomBattleMoves: ["protect","batonpass","substitute","hiddenpowergrass","swordsdance","firepledge"], @@ -2162,7 +2178,8 @@ exports.BattleFormatsData = { }, blazikenmega: { randomBattleMoves: ["flareblitz","highjumpkick","protect","swordsdance","substitute","batonpass","stoneedge","knockoff"], - requiredItem: "Blazikenite" + requiredItem: "Blazikenite", + tier: "Uber" }, mudkip: { randomBattleMoves: ["hydropump","earthpower","hiddenpowerelectric","icebeam","sludgewave"], @@ -2187,7 +2204,8 @@ exports.BattleFormatsData = { swampertmega: { randomBattleMoves: ["raindance","waterfall","earthquake","icepunch","superpower"], randomDoubleBattleMoves: ["waterfall","earthquake","raindance","icepunch","superpower","protect"], - requiredItem: "Swampertite" + requiredItem: "Swampertite", + tier: "UU" }, poochyena: { randomBattleMoves: ["superfang","foulplay","suckerpunch","toxic","crunch","firefang","icefang","poisonfang"], @@ -2320,12 +2338,13 @@ exports.BattleFormatsData = { eventPokemon: [ {"generation":5,"level":50,"isHidden":false,"abilities":["trace"],"moves":["hypnosis","thunderbolt","focusblast","psychic"],"pokeball":"cherishball"} ], - tier: "OU" + tier: "(OU)" }, gardevoirmega: { randomBattleMoves: ["calmmind","hypervoice","psyshock","focusblast","substitute","taunt","willowisp"], randomDoubleBattleMoves: ["psyshock","focusblast","shadowball","calmmind","thunderbolt","hypervoice","protect"], - requiredItem: "Gardevoirite" + requiredItem: "Gardevoirite", + tier: "OU" }, gallade: { randomBattleMoves: ["bulkup","drainpunch","icepunch","shadowsneak","closecombat","zenheadbutt","knockoff","trick"], @@ -2471,12 +2490,13 @@ exports.BattleFormatsData = { {"generation":5,"level":50,"gender":"M","isHidden":true,"moves":["foulplay","octazooka","tickle","trick"],"pokeball":"cherishball"}, {"generation":6,"level":50,"nature":"Relaxed","isHidden":true,"moves":["calmmind","willowisp","recover","shadowball"],"pokeball":"cherishball"} ], - tier: "OU" + tier: "(OU)" }, sableyemega: { randomBattleMoves: ["recover","willowisp","darkpulse","calmmind","shadowball"], randomDoubleBattleMoves: ["fakeout","knockoff","darkpulse","shadowball","willowisp","protect"], - requiredItem: "Sablenite" + requiredItem: "Sablenite", + tier: "OU" }, mawile: { randomBattleMoves: ["swordsdance","ironhead","substitute","playrough","suckerpunch","batonpass"], @@ -2510,12 +2530,13 @@ exports.BattleFormatsData = { {"generation":3,"level":50,"moves":["takedown","irontail","protect","metalsound"]}, {"generation":6,"level":50,"nature":"Brave","isHidden":false,"abilities":["rockhead"],"moves":["ironhead","earthquake","headsmash","rockslide"],"pokeball":"cherishball"} ], - tier: "UU" + tier: "(UU)" }, aggronmega: { randomBattleMoves: ["earthquake","heavyslam","icepunch","stealthrock","thunderwave","roar","toxic"], randomDoubleBattleMoves: ["rockslide","earthquake","lowkick","heavyslam","aquatail","protect"], - requiredItem: "Aggronite" + requiredItem: "Aggronite", + tier: "UU" }, meditite: { randomBattleMoves: ["highjumpkick","psychocut","icepunch","thunderpunch","trick","fakeout","bulletpunch","drainpunch","zenheadbutt"], @@ -2547,12 +2568,13 @@ exports.BattleFormatsData = { {"generation":3,"level":44,"moves":["refresh","thunder","raindance","bite"]}, {"generation":6,"level":50,"nature":"Timid","isHidden":false,"abilities":["lightningrod"],"moves":["overheat","thunderbolt","voltswitch","protect"],"pokeball":"cherishball"} ], - tier: "OU" + tier: "(OU)" }, manectricmega: { randomBattleMoves: ["voltswitch","thunderbolt","hiddenpowerice","hiddenpowergrass","overheat"], randomDoubleBattleMoves: ["voltswitch","thunderbolt","hiddenpowerice","hiddenpowergrass","overheat","flamethrower","snarl","protect"], - requiredItem: "Manectite" + requiredItem: "Manectite", + tier: "OU" }, plusle: { randomBattleMoves: ["nastyplot","thunderbolt","substitute","batonpass","hiddenpowerice","encore"], @@ -2622,11 +2644,12 @@ exports.BattleFormatsData = { sharpedo: { randomBattleMoves: ["protect","icebeam","crunch","earthquake","waterfall","destinybond"], randomDoubleBattleMoves: ["protect","icebeam","crunch","earthquake","waterfall","destinybond"], - tier: "UU" + tier: "(UU)" }, sharpedomega: { randomBattleMoves: ["protect","icefang","crunch","earthquake","waterfall","zenheadbutt"], - requiredItem: "Sharpedonite" + requiredItem: "Sharpedonite", + tier: "UU" }, wailmer: { randomBattleMoves: ["waterspout","surf","hydropump","icebeam","hiddenpowergrass","hiddenpowerelectric"], @@ -2652,12 +2675,13 @@ exports.BattleFormatsData = { camerupt: { randomBattleMoves: ["rockpolish","fireblast","earthpower","lavaplume","stealthrock","hiddenpowergrass","roar","stoneedge"], randomDoubleBattleMoves: ["rockpolish","fireblast","earthpower","heatwave","eruption","hiddenpowergrass","protect"], - tier: "RU" + tier: "(RU)" }, cameruptmega: { randomBattleMoves: ["stealthrock","fireblast","earthpower","ancientpower","willowisp","toxic"], randomDoubleBattleMoves: ["fireblast","earthpower","heatwave","eruption","rockslide","protect"], - requiredItem: "Cameruptite" + requiredItem: "Cameruptite", + tier: "RU" }, torkoal: { randomBattleMoves: ["shellsmash","fireblast","earthpower","hiddenpowergrass","stealthrock","rapidspin","yawn","lavaplume"], @@ -2736,12 +2760,13 @@ exports.BattleFormatsData = { {"generation":3,"level":36,"moves":["healbell","dragonbreath","solarbeam","aerialace"]}, {"generation":5,"level":35,"gender":"M","isHidden":true,"moves":["takedown","naturalgift","dragonbreath","falseswipe"]} ], - tier: "OU" + tier: "(OU)" }, altariamega: { randomBattleMoves: ["dragondance","return","hypervoice","healbell","earthquake","roost","dracometeor","fireblast"], randomDoubleBattleMoves: ["dragondance","return","doubleedge","dragonclaw","earthquake","protect","fireblast"], - requiredItem: "Altarianite" + requiredItem: "Altarianite", + tier: "OU" }, zangoose: { randomBattleMoves: ["swordsdance","closecombat","knockoff","quickattack","facade"], @@ -2889,12 +2914,13 @@ exports.BattleFormatsData = { {"generation":3,"level":37,"abilities":["insomnia"],"moves":["helpinghand","feintattack","shadowball","curse"]}, {"generation":5,"level":37,"gender":"F","isHidden":true,"moves":["feintattack","hex","shadowball","cottonguard"]} ], - tier: "RU" + tier: "(RU)" }, banettemega: { randomBattleMoves: ["destinybond","taunt","shadowclaw","suckerpunch","willowisp","knockoff"], randomDoubleBattleMoves: ["destinybond","taunt","shadowclaw","suckerpunch","willowisp","knockoff","protect"], - requiredItem: "Banettite" + requiredItem: "Banettite", + tier: "RU" }, duskull: { randomBattleMoves: ["willowisp","shadowsneak","icebeam","painsplit","substitute","nightshade"], @@ -2942,12 +2968,13 @@ exports.BattleFormatsData = { {"generation":3,"level":35,"abilities":["pressure"],"moves":["razorwind","bite","swordsdance","spite"]}, {"generation":3,"level":70,"abilities":["pressure"],"moves":["doubleteam","slash","futuresight","perishsong"]} ], - tier: "UU" + tier: "(UU)" }, absolmega: { randomBattleMoves: ["swordsdance","suckerpunch","knockoff","fireblast","superpower","pursuit","playrough","icebeam"], randomDoubleBattleMoves: ["swordsdance","suckerpunch","knockoff","fireblast","superpower","protect","playrough"], - requiredItem: "Absolite" + requiredItem: "Absolite", + tier: "UU" }, snorunt: { randomBattleMoves: ["spikes","icebeam","hiddenpowerground","iceshard","crunch","switcheroo"], @@ -2959,12 +2986,13 @@ exports.BattleFormatsData = { glalie: { randomBattleMoves: ["spikes","icebeam","iceshard","taunt","earthquake","explosion","superfang"], randomDoubleBattleMoves: ["icebeam","iceshard","taunt","earthquake","protect"], - tier: "RU" + tier: "(RU)" }, glaliemega: { randomBattleMoves: ["crunch","iceshard","taunt","earthquake","explosion","return","spikes"], randomDoubleBattleMoves: ["crunch","iceshard","taunt","earthquake","explosion","protect","return"], - requiredItem: "Glalitite" + requiredItem: "Glalitite", + tier: "RU" }, froslass: { randomBattleMoves: ["icebeam","spikes","destinybond","shadowball","taunt","thunderwave"], @@ -3070,12 +3098,13 @@ exports.BattleFormatsData = { {"generation":5,"level":45,"isHidden":true,"moves":["psychic","meteormash","hammerarm","doubleedge"]}, {"generation":5,"level":58,"nature":"Serious","isHidden":false,"moves":["earthquake","hyperbeam","psychic","meteormash"],"pokeball":"cherishball"} ], - tier: "OU" + tier: "(OU)" }, metagrossmega: { randomBattleMoves: ["meteormash","earthquake","agility","zenheadbutt","hammerarm","icepunch"], randomDoubleBattleMoves: ["meteormash","earthquake","protect","zenheadbutt","thunderpunch","icepunch"], - requiredItem: "Metagrossite" + requiredItem: "Metagrossite", + tier: "OU" }, regirock: { randomBattleMoves: ["stealthrock","thunderwave","stoneedge","drainpunch","curse","rest","rockslide","toxic"], @@ -3117,7 +3146,8 @@ exports.BattleFormatsData = { latiasmega: { randomBattleMoves: ["calmmind","dragonpulse","surf","dracometeor","roost","hiddenpowerfire","substitute","psyshock"], randomDoubleBattleMoves: ["dragonpulse","psychic","tailwind","helpinghand","healpulse","lightscreen","reflect","protect"], - requiredItem: "Latiasite" + requiredItem: "Latiasite", + tier: "(OU)" }, latios: { randomBattleMoves: ["dracometeor","hiddenpowerfire","surf","thunderbolt","psyshock","roost","trick","defog"], @@ -3133,7 +3163,8 @@ exports.BattleFormatsData = { latiosmega: { randomBattleMoves: ["calmmind","dracometeor","hiddenpowerfire","psyshock","roost","memento","defog"], randomDoubleBattleMoves: ["dracometeor","dragonpulse","surf","thunderbolt","psyshock","substitute","trick","tailwind","protect","hiddenpowerfire"], - requiredItem: "Latiosite" + requiredItem: "Latiosite", + tier: "(OU)" }, kyogre: { randomBattleMoves: ["waterspout","originpulse","scald","thunder","icebeam"], @@ -3491,12 +3522,13 @@ exports.BattleFormatsData = { lopunny: { randomBattleMoves: ["return","switcheroo","highjumpkick","icepunch","healingwish"], randomDoubleBattleMoves: ["return","switcheroo","highjumpkick","firepunch","icepunch","fakeout","protect","encore"], - tier: "OU" + tier: "(OU)" }, lopunnymega: { randomBattleMoves: ["return","highjumpkick","substitute","thunderpunch","icepunch"], randomDoubleBattleMoves: ["return","highjumpkick","protect","fakeout","icepunch","encore"], - requiredItem: "Lopunnite" + requiredItem: "Lopunnite", + tier: "OU" }, glameow: { randomBattleMoves: ["fakeout","uturn","suckerpunch","hypnosis","quickattack","return","foulplay"], @@ -3563,7 +3595,8 @@ exports.BattleFormatsData = { garchompmega: { randomBattleMoves: ["outrage","dracometeor","earthquake","stoneedge","fireblast","swordsdance"], randomDoubleBattleMoves: ["substitute","dragonclaw","earthquake","stoneedge","rockslide","swordsdance","protect","fireblast"], - requiredItem: "Garchompite" + requiredItem: "Garchompite", + tier: "(OU)" }, riolu: { randomBattleMoves: ["crunch","rockslide","copycat","drainpunch","highjumpkick","icepunch","swordsdance"], @@ -3641,12 +3674,13 @@ exports.BattleFormatsData = { abomasnow: { randomBattleMoves: ["woodhammer","iceshard","blizzard","gigadrain","leechseed","substitute","focuspunch","earthquake"], randomDoubleBattleMoves: ["blizzard","iceshard","gigadrain","protect","focusblast","woodhammer","earthquake"], - tier: "UU" + tier: "(UU)" }, abomasnowmega: { randomBattleMoves: ["blizzard","gigadrain","woodhammer","earthquake","iceshard","hiddenpowerfire"], randomDoubleBattleMoves: ["blizzard","iceshard","gigadrain","protect","focusblast","woodhammer","earthquake"], - requiredItem: "Abomasite" + requiredItem: "Abomasite", + tier: "(UU)" }, rotom: { randomBattleMoves: ["thunderbolt","voltswitch","shadowball","substitute","painsplit","hiddenpowerice","trick","willowisp"], @@ -4139,12 +4173,13 @@ exports.BattleFormatsData = { {"generation":5,"level":30,"gender":"F","nature":"Calm","isHidden":false,"abilities":["healer"],"moves":["healpulse","helpinghand","refresh","doubleslap"],"pokeball":"cherishball"}, {"generation":5,"level":30,"gender":"F","nature":"Serious","isHidden":false,"abilities":["healer"],"moves":["healpulse","helpinghand","refresh","present"],"pokeball":"cherishball"} ], - tier: "NU" + tier: "(NU)" }, audinomega: { randomBattleMoves: ["wish","calmmind","healbell","dazzlinggleam","hypervoice","protect"], randomDoubleBattleMoves: ["healpulse","protect","healbell","trickroom","thunderwave","hypervoice","helpinghand","dazzlinggleam"], - requiredItem: "Audinite" + requiredItem: "Audinite", + tier: "NU" }, timburr: { randomBattleMoves: ["machpunch","bulkup","drainpunch","icepunch","knockoff"], @@ -5270,12 +5305,13 @@ exports.BattleFormatsData = { {"generation":6,"level":50,"moves":["diamondstorm","reflect","return","moonblast"],"pokeball":"cherishball"} ], unobtainableShiny: true, - tier: "OU" + tier: "(OU)" }, dianciemega: { randomBattleMoves: ["calmmind","moonblast","earthpower","hiddenpowerfire","psyshock","diamondstorm"], randomDoubleBattleMoves: ["diamondstorm","moonblast","calmmind","psyshock","earthpower","hiddenpowerfire","dazzlinggleam","protect"], - requiredItem: "Diancite" + requiredItem: "Diancite", + tier: "OU" }, hoopa: { randomBattleMoves: ["nastyplot","psyshock","shadowball","focusblast","trick"], diff --git a/team-validator.js b/team-validator.js index 403890b5c2..813963d07d 100644 --- a/team-validator.js +++ b/team-validator.js @@ -501,9 +501,16 @@ Validator = (function () { } } } - setHas[toId(template.tier)] = true; - if (banlistTable[template.tier]) { - problems.push(name + " is in " + template.tier + ", which is banned."); + if (item.megaEvolves === template.species) { + template = tools.getTemplate(item.megaStone); + } + if (template.tier) { + var tier = template.tier; + if (tier.charAt(0) === '(') tier = tier.slice(1, -1); + setHas[toId(tier)] = true; + if (banlistTable[tier]) { + problems.push(template.species + " is in " + tier + ", which is banned."); + } } if (teamHas) {