USUM update (#184)

smogon · Nov 16, 2017 · 9e672ae · 9e672ae
1 parent a5ee0a1
commit 9e672ae
Show file tree

Hide file tree

Showing 4 changed files with 189 additions and 3 deletions.
diff --git a/js/damage.js b/js/damage.js
@@ -79,7 +79,7 @@ function getDamageResult(attacker, defender, move, field) {
             defAbility = "";
             description.attackerAbility = attacker.ability;
         }
-        if (move.name === "Moongeist Beam" || move.name === "Sunsteel Strike") {
+        if (move.name === "Menacing Moonraze Maelstrom" || move.name === "Moongeist Beam" || move.name === "Searing Sunraze Smash" || move.name === "Sunsteel Strike") {
             defAbility = "";
         }
     }

diff --git a/js/data/ability_data.js b/js/data/ability_data.js
@@ -133,6 +133,7 @@ var ABILITIES_SM = ABILITIES_XY.concat([
     'Long Reach',
     'Merciless',
     'Misty Surge',
+    'Neuroforce',
     'Power Construct',
     'Power of Alchemy',
     'Prism Armor',

diff --git a/js/data/move_data.js b/js/data/move_data.js
@@ -2788,6 +2788,14 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
         isSpread: true,
         zp: 185
     },
+    'Clangorous Soulblaze': {
+        bp: 185,
+        type: 'Dragon',
+        category: 'Special',
+        isSound: true,
+        isSpread: true,
+        isZ: true
+    },
     'Clear Smog': { zp: 100 },
     'Close Combat': { zp: 190 },
     'Continental Crush': {
@@ -3035,7 +3043,20 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
     'Leaf Storm': { zp: 195 },
     'Leaf Tornado': { zp: 120 },
     'Leech Life': { bp: 80, zp: 160 },
+    'Let\'s Snuggle Forever': {
+        bp: 190,
+        type: 'Fairy',
+        category: 'Physical',
+        makesContact: true,
+        isZ: true
+    },
     'Light of Ruin': { zp: 200 },
+    'Light That Burns the Sky': {
+        bp: 200,
+        type: 'Psychic',
+        category: 'Special',
+        isZ: true
+    },
     'Liquidation': {
         bp: 85,
         type: 'Water',
@@ -3067,8 +3088,21 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
         isZ: true
     },
     'Megahorn': { zp: 190 },
+    'Menacing Moonraze Maelstrom': {
+        bp: 200,
+        type: 'Ghost',
+        category: 'Special',
+        isZ: true
+    },
     'Metal Claw': { zp: 100 },
     'Meteor Mash': { zp: 175 },
+    'Mind Blown': {
+        bp: 150,
+        type: 'Fire',
+        category: 'Special',
+        isSpread: true,
+        zp: 200
+    },
     'Mirror Shot': { zp: 120 },
     'Mist Ball': { zp: 140 },
     'Moonblast': { zp: 175 },
@@ -3117,7 +3151,21 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
     'Payback': { zp: 100 },
     'Petal Dance': { zp: 190 },
     'Phantom Force': { zp: 175 },
+    'Photon Geyser': {
+        bp: 100,
+        type: 'Psychic',
+        category: 'Physical',
+        zp: 180
+    },
     'Pin Missile': { zp: 140 },
+    'Plasma Fists': {
+        bp: 100,
+        type: 'Electric',
+        category: 'Physical',
+        makesContact: true,
+        isPunch: true,
+        zp: 180
+    },
     'Play Rough': { zp: 175 },
     'Pluck': { zp: 120 },
     'Poison Fang': { zp: 100 },
@@ -3164,8 +3212,8 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
         bp: 210,
         type: 'Normal',
         category: 'Physical',
-        isZ: true,
-        makesContact: true
+        makesContact: true,
+        isZ: true
     },
     'Punishment': { zp: 160 },
     'Pursuit': { zp: 100 },
@@ -3204,6 +3252,13 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
     },
     'Scald': { zp: 160 },
     'Searing Shot': { zp: 180 },
+    'Searing Sunraze Smash': {
+        bp: 200,
+        type: 'Steel',
+        category: 'Physical',
+        makesContact: true,
+        isZ: true
+    },
     'Secret Power': { zp: 140 },
     'Secret Sword': { zp: 160 },
     'Seed Bomb': { zp: 160 },
@@ -3301,6 +3356,12 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
         hasSecondaryEffect: true,
         zp: 160
     },
+    'Splintered Stormshards': {
+        bp: 190,
+        type: 'Rock',
+        category: 'Physical',
+        isZ: true
+    },
     'Steam Eruption': { zp: 185 },
     'Steamroller': { zp: 120 },
     'Steel Wing': { zp: 140 },

diff --git a/js/data/pokedex.js b/js/data/pokedex.js
@@ -11257,6 +11257,20 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     "ab": "Fluffy",
     "w": 135.0,
   },
+  "Blacephalon": {
+    "t1": "Fire",
+    "t2": "Ghost",
+    "bs": {
+      "hp": 53,
+      "at": 127,
+      "df": 53,
+      "sa": 151,
+      "sd": 79,
+      "sp": 107
+    },
+    "w": 13.0,
+    "ab": "Beast Boost"
+  },
   "Bounsweet": {
     "t1": "Grass",
     "bs": {
@@ -11774,6 +11788,20 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     },
     "w": 25.0
   },
+  "Lycanroc-Dusk": {
+    "t1": "Rock",
+    "bs": {
+      "hp": 75,
+      "at": 117,
+      "df": 65,
+      "sa": 55,
+      "sd": 65,
+      "sp": 110
+    },
+    "w": 25.0,
+    "ab": "Tough Claws",
+    "isAlternateForme": true
+  },
   "Lycanroc-Midnight": {
     "t1": "Rock",
     "bs": {
@@ -11944,6 +11972,20 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     "w": 52.0,
     "isAlternateForme": true
   },
+  "Naganadel": {
+    "t1": "Poison",
+    "t2": "Dragon",
+    "bs": {
+      "hp": 73,
+      "at": 73,
+      "df": 73,
+      "sa": 127,
+      "sd": 73,
+      "sp": 121
+    },
+    "w": 150.0,
+    "ab": "Beast Boost"
+  },
   "Necrozma": {
     "t1": "Psychic",
     "bs": {
@@ -11956,6 +11998,48 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     },
     "w": 230.0,
   },
+  "Necrozma-Dawn-Wings": {
+    "t1": "Psychic",
+    "t2": "Ghost",
+    "bs": {
+      "hp": 97,
+      "at": 113,
+      "df": 109,
+      "sa": 157,
+      "sd": 127,
+      "sp": 77
+    },
+    "w": 350.0,
+    "ab": "Prism Armor"
+  },
+  "Necrozma-Dusk-Mane": {
+    "t1": "Psychic",
+    "t2": "Steel",
+    "bs": {
+      "hp": 97,
+      "at": 157,
+      "df": 127,
+      "sa": 113,
+      "sd": 109,
+      "sp": 77
+    },
+    "w": 460.0,
+    "ab": "Prism Armor"
+  },
+  "Necrozma-Ultra": {
+    "t1": "Psychic",
+    "t2": "Dragon",
+    "bs": {
+      "hp": 97,
+      "at": 167,
+      "df": 97,
+      "sa": 167,
+      "sd": 97,
+      "sp": 129
+    },
+    "w": 230.0,
+    "ab": "Prism Armor"
+  },
   "Nihilego": {
     "t1": "Rock",
     "t2": "Poison",
@@ -12117,6 +12201,19 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     },
     "w": 1.2
   },
+  "Poipole": {
+    "t1": "Poison",
+    "bs": {
+      "hp": 67,
+      "at": 73,
+      "df": 67,
+      "sa": 73,
+      "sd": 67,
+      "sp": 73
+    },
+    "w": 1.8,
+    "ab": "Beast Boost"
+  },
   "Popplio": {
     "t1": "Water",
     "bs": {
@@ -12561,6 +12658,20 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     "w": 230.0,
     "ab": "Full Metal Body"
   },
+  "Stakataka": {
+    "t1": "Rock",
+    "t2": "Steel",
+    "bs": {
+      "hp": 61,
+      "at": 131,
+      "df": 211,
+      "sa": 53,
+      "sd": 101,
+      "sp": 13
+    },
+    "w": 820.0,
+    "ab": "Beast Boost"
+  },
   "Steenee": {
     "t1": "Grass",
     "bs": {
@@ -12839,6 +12950,19 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     },
     "w": 6.0
   },
+  "Zeraora": {
+    "t1": "Electric",
+    "bs": {
+      "hp": 88,
+      "at": 112,
+      "df": 75,
+      "sa": 102,
+      "sd": 80,
+      "sp": 143
+    },
+    "w": 44.5,
+    "ab": "Volt Absorb"
+  },
   "Zygarde-10%": {
     "t1": "Dragon",
     "t2": "Ground",