From 2cabcc0c69e3c44b11cd9f8dbb39b8a92c20ff74 Mon Sep 17 00:00:00 2001 From: Kevin Lau Date: Mon, 12 Oct 2015 12:14:15 -0700 Subject: [PATCH] Update NFE Random Battle sets being used in Seasonals Also, allow Pumpkaboo/Gourgeist formes in Seasonals and add a nickname for Espurr. --- data/formats-data.js | 42 +++++++++++++++++++++--------------------- data/scripts.js | 13 +++++++++++-- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/data/formats-data.js b/data/formats-data.js index f294a81759..2bbc1d071b 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -192,7 +192,7 @@ exports.BattleFormatsData = { tier: "PU" }, ekans: { - randomBattleMoves: ["coil","gunkshot","seedbomb","glare","suckerpunch","aquatail","earthquake","rest","rockslide"], + randomBattleMoves: ["coil","gunkshot","glare","suckerpunch","earthquake","rest"], randomDoubleBattleMoves: ["gunkshot","seedbomb","suckerpunch","aquatail","earthquake","rest","rockslide","protect"], eventPokemon: [ {"generation":3,"level":14,"abilities":["shedskin"],"moves":["leer","wrap","poisonsting","bite"]}, @@ -1754,7 +1754,7 @@ exports.BattleFormatsData = { tier: "NU" }, murkrow: { - randomBattleMoves: ["substitute","suckerpunch","bravebird","heatwave","hiddenpowergrass","roost","darkpulse","thunderwave"], + randomBattleMoves: ["substitute","suckerpunch","bravebird","heatwave","roost","darkpulse","thunderwave"], eventPokemon: [ {"generation":3,"level":10,"gender":"M","abilities":["insomnia"],"moves":["peck","astonish"]} ], @@ -2636,7 +2636,7 @@ exports.BattleFormatsData = { tier: "PU" }, carvanha: { - randomBattleMoves: ["protect","hydropump","surf","icebeam","waterfall","crunch","aquajet","destinybond"], + randomBattleMoves: ["protect","hydropump","icebeam","waterfall","crunch","aquajet","destinybond"], eventPokemon: [ {"generation":3,"level":15,"moves":["refresh","waterpulse","bite","scaryface"]}, {"generation":6,"level":1,"isHidden":true,"moves":["leer","bite","hydropump"]} @@ -2928,7 +2928,7 @@ exports.BattleFormatsData = { tier: "RU" }, duskull: { - randomBattleMoves: ["willowisp","shadowsneak","icebeam","painsplit","substitute","nightshade"], + randomBattleMoves: ["willowisp","shadowsneak","painsplit","substitute","nightshade","destinybond","trickroom"], eventPokemon: [ {"generation":3,"level":45,"moves":["pursuit","curse","willowisp","meanlook"]}, {"generation":3,"level":19,"moves":["helpinghand","shadowball","astonish","confuseray"]} @@ -2982,7 +2982,7 @@ exports.BattleFormatsData = { tier: "UU" }, snorunt: { - randomBattleMoves: ["spikes","icebeam","hiddenpowerground","iceshard","crunch","switcheroo"], + randomBattleMoves: ["spikes","icebeam","iceshard","shadowball","toxic"], eventPokemon: [ {"generation":3,"level":22,"abilities":["innerfocus"],"moves":["sing","waterpulse","bite","icywind"]} ], @@ -3516,7 +3516,7 @@ exports.BattleFormatsData = { tier: "RU" }, drifloon: { - randomBattleMoves: ["shadowball","substitute","calmmind","hypnosis","hiddenpowerfighting","thunderbolt","destinybond","willowisp","stockpile","batonpass","disable"], + randomBattleMoves: ["shadowball","substitute","calmmind","hypnosis","hiddenpowerfighting","thunderbolt","destinybond","willowisp"], tier: "LC" }, drifblim: { @@ -4058,7 +4058,7 @@ exports.BattleFormatsData = { tier: "PU" }, purrloin: { - randomBattleMoves: ["encore","suckerpunch","playrough","uturn","knockoff"], + randomBattleMoves: ["encore","taunt","uturn","knockoff","thunderwave"], tier: "LC" }, liepard: { @@ -4240,11 +4240,11 @@ exports.BattleFormatsData = { tier: "PU" }, venipede: { - randomBattleMoves: ["toxicspikes","steamroller","spikes","poisonjab"], + randomBattleMoves: ["toxicspikes","infestation","spikes","endeavor","protect"], tier: "LC" }, whirlipede: { - randomBattleMoves: ["toxicspikes","steamroller","spikes","poisonjab"], + randomBattleMoves: ["toxicspikes","infestation","spikes","endeavor","protect"], tier: "NFE" }, scolipede: { @@ -4406,11 +4406,11 @@ exports.BattleFormatsData = { tier: "RU" }, gothita: { - randomBattleMoves: ["psychic","thunderbolt","hiddenpowerfighting","shadowball","substitute","calmmind","reflect","lightscreen","trick","grassknot","signalbeam"], + randomBattleMoves: ["psychic","thunderbolt","hiddenpowerfighting","shadowball","substitute","calmmind","trick","grassknot"], tier: "LC" }, gothorita: { - randomBattleMoves: ["psychic","thunderbolt","hiddenpowerfighting","shadowball","substitute","calmmind","reflect","lightscreen","trick","grassknot","signalbeam"], + randomBattleMoves: ["psychic","psyshock","thunderbolt","hiddenpowerfighting","shadowball","substitute","calmmind","trick","grassknot"], eventPokemon: [ {"generation":5,"level":32,"gender":"M","isHidden":true,"moves":["psyshock","flatter","futuresight","mirrorcoat"]}, {"generation":5,"level":32,"gender":"M","isHidden":true,"moves":["psyshock","flatter","futuresight","imprison"]} @@ -4558,7 +4558,7 @@ exports.BattleFormatsData = { tier: "RU" }, elgyem: { - randomBattleMoves: ["nastyplot","psychic","thunderbolt","hiddenpowerfighting","substitute","calmmind","recover","trick","trickroom","signalbeam"], + randomBattleMoves: ["nastyplot","psychic","thunderbolt","hiddenpowerfighting","recover","trickroom","signalbeam"], tier: "LC" }, beheeyem: { @@ -4567,11 +4567,11 @@ exports.BattleFormatsData = { tier: "PU" }, litwick: { - randomBattleMoves: ["calmmind","shadowball","energyball","fireblast","hiddenpowerground","hiddenpowerrock","trick","substitute","painsplit"], + randomBattleMoves: ["shadowball","energyball","fireblast","hiddenpowerground","trickroom","substitute","painsplit"], tier: "LC" }, lampent: { - randomBattleMoves: ["calmmind","shadowball","energyball","fireblast","hiddenpowerground","hiddenpowerrock","trick","substitute","painsplit"], + randomBattleMoves: ["calmmind","shadowball","energyball","fireblast","hiddenpowerground","substitute","painsplit"], tier: "NFE" }, chandelure: { @@ -4726,7 +4726,7 @@ exports.BattleFormatsData = { tier: "LC" }, zweilous: { - randomBattleMoves: ["outrage","crunch","firefang","dragontail","thunderwave","superpower"], + randomBattleMoves: ["outrage","crunch","headsmash","dragontail","superpower","rest","sleeptalk"], tier: "NFE" }, hydreigon: { @@ -5051,7 +5051,7 @@ exports.BattleFormatsData = { tier: "PU" }, espurr: { - randomBattleMoves: ["fakeout","yawn","thunderwave","psyshock","trick","darkpulse"], + randomBattleMoves: ["fakeout","yawn","thunderwave","psychic","trick","darkpulse"], tier: "LC" }, meowstic: { @@ -5220,7 +5220,7 @@ exports.BattleFormatsData = { tier: "OU" }, phantump: { - randomBattleMoves: ["hornleech","leechseed","phantomforce","substitute","willowisp","curse","bulldoze","rockslide","poisonjab"], + randomBattleMoves: ["hornleech","leechseed","phantomforce","substitute","willowisp","rest"], tier: "LC" }, trevenant: { @@ -5229,21 +5229,21 @@ exports.BattleFormatsData = { tier: "RU" }, pumpkaboo: { - randomBattleMoves: ["willowisp","shadowsneak","fireblast","synthesis","seedbomb"], + randomBattleMoves: ["willowisp","shadowsneak","destinybond","synthesis","seedbomb","leechseed"], tier: "LC" }, pumpkaboosmall: { - randomBattleMoves: ["willowisp","shadowsneak","fireblast","synthesis","seedbomb"], + randomBattleMoves: ["willowisp","shadowsneak","destinybond","synthesis","seedbomb"], unreleasedHidden: true, tier: "LC" }, pumpkaboolarge: { - randomBattleMoves: ["willowisp","shadowsneak","fireblast","synthesis","seedbomb"], + randomBattleMoves: ["willowisp","shadowsneak","leechseed","synthesis","seedbomb"], unreleasedHidden: true, tier: "LC" }, pumpkaboosuper: { - randomBattleMoves: ["willowisp","shadowsneak","fireblast","synthesis","seedbomb"], + randomBattleMoves: ["willowisp","shadowsneak","leechseed","synthesis","seedbomb"], eventPokemon: [ {"generation":6,"level":50,"moves":["trickortreat","astonish","scaryface","shadowsneak"],"pokeball":"cherishball"} ], diff --git a/data/scripts.js b/data/scripts.js index 138ccd66da..49a8ea3915 100644 --- a/data/scripts.js +++ b/data/scripts.js @@ -3157,8 +3157,8 @@ exports.BattleScripts = { 'houndoom', 'mightyena', 'dustox', 'shiftry', 'shedinja', 'exploud', 'sableye', 'mawile', 'swalot', 'carvanha', 'sharpedo', 'cacturne', 'seviper', 'lunatone', 'claydol', 'shuppet', 'banette', 'duskull', 'dusclops', 'absol', 'snorunt', 'glalie', 'drifloon', 'drifblim', 'mismagius', 'honchkrow', 'skuntank', 'spiritomb', 'drapion', - 'toxicroak', 'weavile', 'tangrowth', 'gliscor', 'dusknoir', 'froslass', 'rotom', 'rotom-wash', 'rotom-heat', - 'rotom-mow', 'purrloin', 'liepard', 'swoobat', 'whirlipede', 'scolipede', 'basculin', 'krookodile', 'sigilyph', + 'toxicroak', 'weavile', 'tangrowth', 'gliscor', 'dusknoir', 'froslass', 'rotom', 'rotomwash', 'rotomheat', + 'rotommow', 'purrloin', 'liepard', 'swoobat', 'whirlipede', 'scolipede', 'basculin', 'krookodile', 'sigilyph', 'yamask', 'cofagrigus', 'garbodor', 'zorua', 'zoroark', 'gothita', 'gothorita', 'gothitelle', 'frillish', 'jellicent', 'joltik', 'galvantula', 'elgyem', 'beheeyem', 'litwick', 'lampent', 'chandelure', 'golurk', 'zweilous', 'hydreigon', 'volcarona', 'espurr', 'meowstic', 'honedge', 'doublade', 'aegislash', 'malamar', @@ -3169,6 +3169,13 @@ exports.BattleScripts = { for (var i = 0; i < 6; i++) { var mon = this.sampleNoReplace(pool); var template = this.getTemplate(mon); + if (mon === 'pumpkaboo' || mon === 'gourgeist') { + var forme = this.random(4); + if (forme > 0) { + mon = template.otherFormes[forme - 1]; + template = this.getTemplate(mon); + } + } var set = this.randomSet(template, i, {megaCount: 1}); set.species = mon; if (mon === 'magikarp') { @@ -3183,6 +3190,8 @@ exports.BattleScripts = { set.name = 'Le Toucan of Luck'; } else if (mon === 'machamp') { set.name = 'John Cena'; + } else if (mon === 'espurr') { + set.name = 'Devourer of Souls'; } set.moves[4] = 'trickortreat'; }