From 6a726fb8591216d0b27f6e2bc04d2b1d3fd900bf Mon Sep 17 00:00:00 2001 From: Marty-D Date: Thu, 15 Dec 2016 15:15:17 -0500 Subject: [PATCH] Add new event Pokemon --- data/formats-data.js | 8 ++++++++ data/learnsets.js | 28 +++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/data/formats-data.js b/data/formats-data.js index f51e49b2302b..321cc63dee61 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -293,6 +293,7 @@ exports.BattleFormatsData = { {"generation": 6, "level": 99, "isHidden": false, "moves":["happyhour", "playnice", "holdhands", "flash"], "pokeball": "cherishball"}, {"generation": 6, "level": 10, "isHidden": false, "moves":["fly", "surf", "agility", "celebrate"], "pokeball": "cherishball"}, {"generation": 6, "level": 10, "isHidden": false, "moves":["bestow", "holdhands", "return", "playnice"], "pokeball": "healball"}, + {"generation": 7, "level": 10, "nature": "Jolly", "isHidden": false, "moves":["celebrate", "growl", "playnice", "quickattack"], "pokeball": "cherishball"}, ], tier: "NFE", }, @@ -431,6 +432,9 @@ exports.BattleFormatsData = { tier: "Bank-LC", }, vulpixalola: { + eventPokemon: [ + {"generation": 7, "level": 10, "isHidden": false, "moves":["celebrate", "tailwhip", "babydolleyes", "iceshard"], "pokeball": "cherishball"}, + ], tier: "LC", }, ninetales: { @@ -1380,6 +1384,7 @@ exports.BattleFormatsData = { {"generation": 5, "level": 50, "gender": "F", "nature": "Hardy", "isHidden": false, "abilities":["adaptability"], "moves":["sing", "return", "echoedvoice", "attract"], "pokeball": "cherishball"}, {"generation": 6, "level": 10, "isHidden": false, "moves":["celebrate", "sandattack", "babydolleyes", "swift"], "pokeball": "cherishball"}, {"generation": 6, "level": 15, "shiny": true, "isHidden": true, "moves":["swift", "quickattack", "babydolleyes", "helpinghand"], "pokeball": "cherishball"}, + {"generation": 7, "level": 10, "nature": "Jolly", "isHidden": false, "moves":["celebrate", "sandattack", "babydolleyes"], "pokeball": "cherishball"}, ], tier: "LC", }, @@ -5916,6 +5921,9 @@ exports.BattleFormatsData = { }, comfey: { randomBattleMoves: ["aromatherapy", "drainingkiss", "toxic", "synthesis", "uturn"], + eventPokemon: [ + {"generation": 7, "level": 10, "nature": "Jolly", "isHidden": false, "moves":["celebrate", "leechseed", "drainingkiss", "magicalleaf"], "pokeball": "cherishball"}, + ], tier: "New", }, oranguru: { diff --git a/data/learnsets.js b/data/learnsets.js index e54553f6d0ac..9b8b3b4f69af 100644 --- a/data/learnsets.js +++ b/data/learnsets.js @@ -3294,7 +3294,7 @@ exports.BattleLearnsets = { bodyslam: ["3T"], brickbreak: ["7M", "6M", "5M", "5S26", "4M", "3M"], captivate: ["4M"], - celebrate: ["6S31", "6S41"], + celebrate: ["7S43", "6S31", "6S41"], charge: ["7E"], chargebeam: ["7M", "6M", "5M", "4M"], charm: ["6S36"], @@ -3327,7 +3327,7 @@ exports.BattleLearnsets = { focuspunch: ["6T", "4M", "3M"], frustration: ["7M", "6M", "5M", "4M", "3M"], grassknot: ["7M", "6M", "5M", "5S25", "5S26", "5S27", "4M", "4S13"], - growl: ["7L5", "6L5", "6S31", "5L1", "4L1", "3L1", "3S1", "3S2", "3S3", "3S4", "3S5", "3S10"], + growl: ["7L5", "7S43", "6L5", "6S31", "5L1", "4L1", "3L1", "3S1", "3S2", "3S3", "3S4", "3S5", "3S10"], happyhour: ["6S40"], headbutt: ["5S28", "4T"], heartstamp: ["6S34"], @@ -3346,10 +3346,10 @@ exports.BattleLearnsets = { mudslap: ["4T", "3T"], naturalgift: ["4M"], nuzzle: ["7L29", "6L23", "6S36", "6S38"], - playnice: ["7L7", "6L7", "6S31", "6S35", "6S36", "6S38", "6S40", "6S42"], + playnice: ["7L7", "7S43", "6L7", "6S31", "6S35", "6S36", "6S38", "6S40", "6S42"], present: ["7E", "4S12", "4S15", "4S17", "4S18", "4S20", "4S22"], protect: ["7M", "6M", "5M", "5S27", "4M", "4S14", "4S16", "3M"], - quickattack: ["7L10", "6L10", "6S31", "6S32", "6S33", "6S34", "6S37", "5L13", "5S24", "5S25", "5S29", "5S30", "4L13", "4S11", "4S12", "4S15", "4S17", "4S18", "4S20", "4S21", "4S22", "3L11"], + quickattack: ["7L10", "7S43", "6L10", "6S31", "6S32", "6S33", "6S34", "6S37", "5L13", "5S24", "5S25", "5S29", "5S30", "4L13", "4S11", "4S12", "4S15", "4S17", "4S18", "4S20", "4S21", "4S22", "3L11"], raindance: ["7M", "6M", "5M", "4M", "3M"], rest: ["7M", "6M", "5M", "4M", "4S19", "3M"], return: ["7M", "6M", "6S42", "5M", "4M", "3M"], @@ -4971,9 +4971,10 @@ exports.BattleLearnsets = { attract: ["7M"], aurorabeam: ["7L28"], auroraveil: ["7M"], - babydolleyes: ["7L9"], + babydolleyes: ["7L9", "7S0"], blizzard: ["7M", "7L42"], captivate: ["7L47"], + celebrate: ["7S0"], charm: ["7E"], confide: ["7M"], confuseray: ["7L12"], @@ -4995,7 +4996,7 @@ exports.BattleLearnsets = { howl: ["7E"], hypnosis: ["7E"], icebeam: ["7M", "7L36"], - iceshard: ["7L10"], + iceshard: ["7L10", "7S0"], icywind: ["7L15"], imprison: ["7L39"], mist: ["7L20"], @@ -5018,7 +5019,7 @@ exports.BattleLearnsets = { substitute: ["7M"], swagger: ["7M"], tailslap: ["7E"], - tailwhip: ["7L4"], + tailwhip: ["7L4", "7S0"], toxic: ["7M"], }}, ninetales: {learnset: { @@ -14466,12 +14467,12 @@ exports.BattleLearnsets = { }}, eevee: {learnset: { attract: ["7M", "6M", "5M", "5S2", "4M", "4S0", "3M"], - babydolleyes: ["7L9", "6L9", "6S3", "6S4"], + babydolleyes: ["7L9", "7S5", "6L9", "6S3", "6S4"], batonpass: ["7L33", "6L33", "5L36", "4L36", "3L36"], bite: ["7L17", "6L17", "5L29", "4L29", "4S0", "3L30"], bodyslam: ["3T"], captivate: ["7E", "6E", "4M"], - celebrate: ["6S3"], + celebrate: ["7S5", "6S3"], charm: ["7L29", "7E", "6L29", "6E", "5L29", "5E", "5D", "4E", "3E"], confide: ["7M", "6M"], covet: ["7L1", "7E", "6T", "6L23", "6E", "5T", "5L21", "5E", "4E", "4S0"], @@ -14505,7 +14506,7 @@ exports.BattleLearnsets = { retaliate: ["6M", "5M"], return: ["7M", "6M", "5M", "5S2", "4M", "3M"], round: ["7M", "6M", "5M"], - sandattack: ["7L5", "6L5", "6S3", "5L8", "5D", "4L8", "3L8"], + sandattack: ["7L5", "7S5", "6L5", "6S3", "5L8", "5D", "4L8", "3L8"], secretpower: ["6M", "4M", "3M"], shadowball: ["7M", "6M", "5M", "4M", "3M"], sing: ["5S2"], @@ -56115,10 +56116,11 @@ exports.BattleLearnsets = { aromatherapy: ["7L43"], attract: ["7M"], calmmind: ["7M"], + celebrate: ["7S0"], confide: ["7M"], dazzlinggleam: ["7M"], doubleteam: ["7M"], - drainingkiss: ["7L7"], + drainingkiss: ["7L7", "7S0"], echoedvoice: ["7M"], endure: ["7E"], energyball: ["7M"], @@ -56133,10 +56135,10 @@ exports.BattleLearnsets = { helpinghand: ["7L1"], hiddenpower: ["7M"], hyperbeam: ["7M"], - leechseed: ["7L4"], + leechseed: ["7L4", "7S0"], lightscreen: ["7M"], luckychant: ["7E"], - magicalleaf: ["7L10"], + magicalleaf: ["7L10", "7S0"], naturalgift: ["7L22"], naturepower: ["7M"], petalblizzard: ["7L25"],