From e786aaf1fac4426ee60b19c779ba9f502acab473 Mon Sep 17 00:00:00 2001 From: Jake White Date: Wed, 8 Nov 2017 18:19:05 -0500 Subject: [PATCH] Added USUM data Default set data and Z-move data --- script_res/move_data.js | 3 ++ script_res/pokedex.js | 2 +- script_res/setdex_tt2017.js | 70 +++++++++++++++++++++++++++++++++++-- 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/script_res/move_data.js b/script_res/move_data.js index 4181cec..0e4871f 100644 --- a/script_res/move_data.js +++ b/script_res/move_data.js @@ -2993,17 +2993,20 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, { }, 'Mind Blown': { bp: 150, + zp: 200, type: 'Fire', category: 'Special', isSpread: true }, 'Plasma Fists': { bp: 100, + zp: 180, type: 'Electric', category: 'Physical', }, 'Photon Geyser': { bp: 100, + zp: 180, type: 'Psychic', category: 'Special', }, diff --git a/script_res/pokedex.js b/script_res/pokedex.js index 32dcb77..7ae1237 100644 --- a/script_res/pokedex.js +++ b/script_res/pokedex.js @@ -12357,7 +12357,7 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, { }, "w": 1.8, }, - "Naganade": { + "Naganadel": { "t1": "Poison", "t2": "Dragon", "bs": { diff --git a/script_res/setdex_tt2017.js b/script_res/setdex_tt2017.js index f4cf3ea..3b072e1 100644 --- a/script_res/setdex_tt2017.js +++ b/script_res/setdex_tt2017.js @@ -10232,7 +10232,73 @@ var SETDEX_TT2017 = { "Knock Off", "Shadow Sneak" ] - } + }, + }, + "Stakataka" : { + "Default Set": { + "level": 50, + "evs": { + "hp": 252, + "at": 252, + "df": 0, + "sa": 0, + "sd": 4, + "sp": 0 + }, + "nature": "Adamant", + "ability": "", + "item": "", + "moves": [ + "Gyro Ball", + "Stone Edge", + "Rock Slide", + "Superpower" + ] + }, + }, + "Blacephalon" : { + "Default Set": { + "level": 50, + "evs": { + "hp": 4, + "at": 0, + "df": 0, + "sa": 252, + "sd": 0, + "sp": 252 + }, + "nature": "Timid", + "ability": "", + "item": "", + "moves": [ + "Mind Blown", + "Shadow Ball", + "Flamethrower", + "Hidden Power Ice" + ] + }, + }, + "Naganadel" : { + "Default Set": { + "level": 50, + "evs": { + "hp": 4, + "at": 0, + "df": 0, + "sa": 252, + "sd": 0, + "sp": 252 + }, + "nature": "Timid", + "ability": "", + "item": "", + "moves": [ + "Draco Meteor", + "Dragon Pulse", + "Sludge Bomb", + "Flamethrower" + ] + }, }, -}; \ No newline at end of file +};