Pushed first USUM info

Pokedex & move/ability data
jake-white · Nov 8, 2017 · 19cefbd · 19cefbd
1 parent 41bfa4f
commit 19cefbd
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 19 deletions.
diff --git a/index.html b/index.html
@@ -45,7 +45,7 @@
                 <input class="gen btn-input" type="radio" name="gen" value="4" id="gen4" /><label class="btn btn-small btn-mid" for="gen4">DPP</label>
                 <input class="gen btn-input" type="radio" name="gen" value="5" id="gen5" /><label class="btn btn-small btn-mid" for="gen5">B/W</label>
                 <input class="gen btn-input" type="radio" name="gen" value="6" id="gen6" /><label class="btn btn-small btn-mid" for="gen6">ORAS</label>
-                <input class="gen btn-input" type="radio" name="gen" value="7" id="gen7" checked="checked" /><label class="btn btn-small btn-right" for="gen7">S/M</label>
+                <input class="gen btn-input" type="radio" name="gen" value="7" id="gen7" checked="checked" /><label class="btn btn-small btn-right" for="gen7">USUM</label>
             </span>
         </div>
         <hr />
@@ -59,7 +59,7 @@
     (adsbygoogle = window.adsbygoogle || []).push({});
     </script>
     </div>
-    <p>Sun/Moon VGC calculator by Jake White (<a href="https://twitter.com/squirrelboyVGC">@squirrelboyVGC</a>). Submit bug/feature reports/requests through <a href="https://github.com/jake-white/VGC-Damage-Calculator/issues">Github</a> or <a href="http://www.trainertower.com/forums/threads/damage-calculator-bug-reports.62/">this thread</a>, not through Twitter please :)</p>
+    <p>Ultra Sun & Ultra Moon VGC calculator by Jake White (<a href="https://twitter.com/squirrelboyVGC">@squirrelboyVGC</a>). Submit bug/feature reports/requests through <a href="https://github.com/jake-white/VGC-Damage-Calculator/issues">Github</a> or <a href="http://www.trainertower.com/forums/threads/damage-calculator-bug-reports.62/">this thread</a>, not through Twitter please :)</p>
     <p>Pelipper is a duck.</p>
 
     <!-- OLD NUGGETBRIDGE ADS -->
@@ -93,7 +93,7 @@
             <div class="big-text"><span id="mainResult">Loading...</span></div>
             <div class="small-text"><span id="damageValues">(If you see this message for more than a few seconds, try enabling JavaScript. If you have that enabled, try deleting your cookies. Otherwise, I won't be able to help you unless you send a screenshot of your browser console.)</span></div>
         </div>
-        
+
         <div class="panel poke-info" id="p1">
             <div class="panel-heading"><h4 class="panel-title">Pokémon 1</h4></div>
             <div class="panel-body">
@@ -192,7 +192,7 @@
 
             </div>
         </div>
-        
+
         <div class="panel field-info">
             <div class="panel-heading">
                 <h4 class="panel-title">Field
@@ -485,5 +485,5 @@ <h4 class="panel-title">Field
     <script type="text/javascript" src="script_res/damage_gsc.js"></script>
     <script type="text/javascript" src="script_res/damage_rby.js"></script>
     <script type="text/javascript" src="script_res/ko_chance.js"></script>
-<script type="text/javascript" src="script_res/statuscalc.js"></script> 
+<script type="text/javascript" src="script_res/statuscalc.js"></script>
 </html>
diff --git a/script_res/ability_data.js b/script_res/ability_data.js
@@ -124,7 +124,8 @@ var ABILITIES_SM = ABILITIES_XY.concat([
     'Full Metal Body',
     'Shadow Shield',
     'Slush Rush',
-    'Surge Surfer'
+    'Surge Surfer',
+    'Neuroforce'
 ]);
 
 ABILITIES_XY.splice(ABILITIES_XY.indexOf('Lightning Rod'), 1, 'Lightning Rod');
diff --git a/script_res/move_data.js b/script_res/move_data.js
@@ -1513,7 +1513,7 @@ var MOVES_BW = $.extend(true, {}, MOVES_DPP, {
         type: 'Psychic',
         category: 'Special',
         dealsPhysicalDamage: true
-    },    
+    },
     'Razor Leaf': {
         bp: 55,
         type: 'Grass',
@@ -1710,7 +1710,7 @@ var MOVES_XY = $.extend(true, {}, MOVES_BW, {
         hasSecondaryEffect: true
     },
     'Frost Breath': { bp: 60 },
-    'Future Sight': { 
+    'Future Sight': {
         bp: 120,
         type: 'Psychic',
         category: 'Special'
@@ -1818,7 +1818,7 @@ var MOVES_XY = $.extend(true, {}, MOVES_BW, {
         isMLG: 'true'
     },
     'Storm Throw': { bp: 60 },
-    'Surf': { bp: 90 },    
+    'Surf': { bp: 90 },
     'Synchronoise': { bp: 120 },
     'Thief': { bp: 60 },
     'Thunder': { bp: 110 },
@@ -1832,7 +1832,7 @@ var MOVES_XY = $.extend(true, {}, MOVES_BW, {
     },
     'Aurora Beam': {
         bp: 65,
-        type: 'Ice', 
+        type: 'Ice',
         category: 'Special'
     }
 });
@@ -2013,7 +2013,7 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
         bp: 90,
         zp: 175
     },
-    'Clanging Scales': {        
+    'Clanging Scales': {
         category: 'Special',
         type: 'Dragon',
         bp: 110,
@@ -2989,5 +2989,52 @@ var MOVES_SM = $.extend(true, {}, MOVES_XY, {
     },
     'Dragon Ascent':{
         zp: 190
-    }
+    },
+    'Mind Blown': {
+        bp: 150,
+        type: 'Fire',
+        category: 'Special',
+        isSpread: true
+    },
+    'Plasma Fists': {
+        bp: 100,
+        type: 'Electric',
+        category: 'Physical',
+    },
+    'Photon Geyser': {
+        bp: 100,
+        type: 'Psychic',
+        category: 'Special',
+    },
+    'Light That Burns the Sky': {
+        bp: 200,
+        type: 'Psychic',
+        category: 'Special',
+    },
+    'Searing Sunraze Smash': {
+        bp: 200,
+        type: 'Steel',
+        category: 'Physical',
+    },
+    'Menacing Moonraze Maelstrom': {
+        bp: 200,
+        type: 'Ghost',
+        category: 'Special',
+    },
+    'Let\'s Snuggle Forever': {
+        bp: 190,
+        type: 'Fairy',
+        category: 'Physical',
+    },
+    'Splintered Stormshards': {
+        bp: 190,
+        type: 'Rock',
+        category: 'Physical',
+    },
+    'Clangorous Soulblaze': {
+        bp: 185,
+        type: 'Dragon',
+        category: 'Special',
+        isSpread: true
+    },
 });
diff --git a/script_res/pokedex.js b/script_res/pokedex.js
@@ -10905,7 +10905,7 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
 
   //hp buffs
   "Magcargo": { "bs": { "hp": 60, "sa": 90 } },
-  "Corsola": { "bs": { "hp": 65, "df": 95, "sd": 95 } },  
+  "Corsola": { "bs": { "hp": 65, "df": 95, "sd": 95 } },
   "Mantine": { "bs": { "hp": 85 } },
   "Lunatone": { "bs": { "hp": 90 } },
   "Solrock": { "bs": { "hp": 90 } },
@@ -10920,12 +10920,12 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
   "Crustle": { "bs": { "at": 105 } },
   "Beartic": { "bs": { "at": 130 } },
 
-  //defense buffs  
+  //defense buffs
   "Qwilfish": { "bs": { "df": 85 } },
   "Volbeat": { "bs": { "df": 75, "sd": 85 } },
   "Illumise": { "bs": { "df": 75, "sd": 85 } },
 
-  //special attack buffs  
+  //special attack buffs
   "Noctowl": { "bs": { "sa": 86 } },
   "Swellow": { "bs": { "sa": 75 } },
 
@@ -10937,7 +10937,7 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
   "Dodrio": { "bs": { "sp": 110 } },
   "Electrode": { "bs": { "sp": 150 } },
   "Delcatty": { "bs": { "sp": 90 } },
-  "Masquerain": { "bs": { "sp": 80, "sa": 100 } }, 
+  "Masquerain": { "bs": { "sp": 80, "sa": 100 } },
 
   //alakazam buff because he's a special snowflake
   "Mega Alakazam": { "bs": { "sd": 105} },
@@ -11937,7 +11937,7 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
       "sd": 100,
       "sp": 60
     },
-    "w": 40.0,    
+    "w": 40.0,
     "formes": ["Minior-Up", "Minior-Down"]
   },
   "Minior-Up": {
@@ -11951,7 +11951,7 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
       "sd": 100,
       "sp": 60
     },
-    "w": 40.0,    
+    "w": 40.0,
     "isAlternateForme": true
   },
   "Minior-Down": {
@@ -11965,7 +11965,7 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
       "sd": 60,
       "sp": 120
     },
-    "w": 0.3,    
+    "w": 0.3,
     "isAlternateForme": true
   },
   "Komala": {
@@ -12345,6 +12345,125 @@ var POKEDEX_SM = $.extend(true, {}, POKEDEX_XY, {
     },
     "w": 22.2,
   },
+  "Poiple": {
+    "t1": "Poison",
+    "bs": {
+      "hp": 67,
+      "at": 73,
+      "df": 67,
+      "sa": 73,
+      "sd": 67,
+      "sp": 73
+    },
+    "w": 1.8,
+  },
+  "Naganade": {
+    "t1": "Poison",
+    "t2": "Dragon",
+    "bs": {
+      "hp": 73,
+      "at": 73,
+      "df": 73,
+      "sa": 127,
+      "sd": 73,
+      "sp": 121
+    },
+    "w": 150.0,
+  },
+  "Blacephalon": {
+    "t1": "Fire",
+    "t2": "Ghost",
+    "bs": {
+      "hp": 53,
+      "at": 127,
+      "df": 53,
+      "sa": 151,
+      "sd": 79,
+      "sp": 107
+    },
+    "w": 13.0,
+  },
+  "Stakataka": {
+    "t1": "Rock",
+    "t2": "Steel",
+    "bs": {
+      "hp": 61,
+      "at": 131,
+      "df": 211,
+      "sa": 53,
+      "sd": 101,
+      "sp": 13
+    },
+    "w": 820.0,
+  },
+  "Lycanroc-Dusk": {
+    "t1": "Rock",
+    "bs": {
+      "hp": 75,
+      "at": 117,
+      "df": 65,
+      "sa": 55,
+      "sd": 65,
+      "sp": 110
+    },
+    "w": 25.0,
+    "ab": "Tough Claws",
+  },
+  "Necrozma-Lunala": {
+    "t1": "Psychic",
+    "t2": "Ghost",
+    "bs": {
+      "hp": 97,
+      "at": 113,
+      "df": 109,
+      "sa": 157,
+      "sd": 127,
+      "sp": 77
+    },
+    "w": 350.0,
+    "ab": "Prism Armor",
+  },
+  "Necrozma-Solgaleo": {
+    "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": "Neuroforce",
+  },
+  "Zeraora": {
+    "t1": "Electric",
+    "bs": {
+      "hp": 88,
+      "at": 112,
+      "df": 75,
+      "sa": 102,
+      "sd": 80,
+      "sp": 143
+    },
+    "w": 44.5,
+    "ab": "Volt Absorb",
+  },
 
 });