@robsonbittencourt/calc 0.11.13 → 0.11.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robsonbittencourt/calc",
-  "version": "0.11.13",
+  "version": "0.11.15",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "unpkg": "dist/production.min.js",

package/src/data/moves.ts

@@ -4534,7 +4534,7 @@ const SV_PATCH: {[name: string]: DeepPartial<MoveData>} = {
     zp: 190,
     maxPower: 140,
     target: 'allAdjacentFoes',
-    self: {boosts: {spa: -1}},
+    self: {boosts: {spa: -2}},
   },
   'Malignant Chain': {
     bp: 100,
@@ -4968,6 +4968,7 @@ const CHAMPIONS_LIST = [
   'Axe Kick',
   'Baby-Doll Eyes',
   'Baneful Bunker',
+  'Barb Barrage',
   'Baton Pass',
   'Beak Blast',
   'Beat Up',
@@ -5195,6 +5196,7 @@ const CHAMPIONS_LIST = [
   'Mach Punch',
   'Magic Powder',
   'Magic Room',
+  'Make It Rain',
   'Magnet Rise',
   'Magnetic Flux',
   'Matcha Gotcha',
@@ -5225,6 +5227,7 @@ const CHAMPIONS_LIST = [
   'Night Shade',
   'Night Slash',
   'Noble Roar',
+  'No Retreat',
   'Nuzzle',
   'Outrage',
   'Overheat',
@@ -5267,6 +5270,7 @@ const CHAMPIONS_LIST = [
   'Quick Attack',
   'Quick Guard',
   'Quiver Dance',
+  'Rage Fist',
   'Rage Powder',
   'Raging Bull',
   'Raging Fury',
@@ -5336,6 +5340,7 @@ const CHAMPIONS_LIST = [
   'Spicy Extract',
   'Spikes',
   'Spiky Shield',
+  'Spirit Break',
   'Spirit Shackle',
   'Spit Up',
   'Spite',
@@ -5390,6 +5395,7 @@ const CHAMPIONS_LIST = [
   'Thunderbolt',
   'Tickle',
   'Tidy Up',
+  'Topsy-Turvy',
   'Torch Song',
   'Torment',
   'Toxic',

package/src/data/species.ts

@@ -10419,7 +10419,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
     types: ['Poison', 'Dragon'],
     bs: {hp: 65, at: 85, df: 105, sa: 132, sd: 163, sp: 44},
     weightkg: 100.3,
-    abilities: {0: 'Poison Point'},
+    abilities: {0: 'Regenerator'},
     baseSpecies: 'Dragalge',
   },
   'Dragonite-Mega': {
@@ -10440,7 +10440,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
     types: ['Electric'],
     bs: {hp: 85, at: 145, df: 80, sa: 135, sd: 90, sp: 80},
     weightkg: 180.0,
-    abilities: {0: 'Levitate'},
+    abilities: {0: 'Eelevate'},
     baseSpecies: 'Eelektross',
   },
   'Emboar-Mega': {
@@ -10462,7 +10462,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
     bs: {hp: 65, at: 135, df: 135, sa: 70, sd: 65, sp: 100},
     weightkg: 99.0,
     gender: 'N',
-    abilities: {0: 'Battle Armor'},
+    abilities: {0: 'Defiant'},
     baseSpecies: 'Falinks',
   },
   'Feraligatr-Mega': {
@@ -10595,28 +10595,28 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
     types: ['Fire', 'Normal'],
     bs: {hp: 86, at: 88, df: 92, sa: 129, sd: 86, sp: 126},
     weightkg: 93.3,
-    abilities: {0: 'Rivalry'},
+    abilities: {0: 'Fire Mane'},
     baseSpecies: 'Pyroar',
   },
   'Raichu-Mega-X': {
     types: ['Electric'],
     bs: {hp: 60, at: 135, df: 95, sa: 90, sd: 95, sp: 110},
     weightkg: 38.0,
-    abilities: {0: 'Surge Surfer'},
+    abilities: {0: 'Electric Surge'},
     baseSpecies: 'Raichu',
   },
   'Raichu-Mega-Y': {
     types: ['Electric'],
     bs: {hp: 60, at: 100, df: 55, sa: 160, sd: 80, sp: 130},
     weightkg: 26.0,
-    abilities: {0: 'Surge Surfer'},
+    abilities: {0: 'No Guard'},
     baseSpecies: 'Raichu',
   },
   'Scolipede-Mega': {
     types: ['Bug', 'Poison'],
     bs: {hp: 60, at: 140, df: 149, sa: 75, sd: 99, sp: 62},
     weightkg: 230.5,
-    abilities: {0: 'Poison Point'},
+    abilities: {0: 'Shell Armor'},
     baseSpecies: 'Scolipede',
   },
   'Scovillain-Mega': {
@@ -10630,7 +10630,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
     types: ['Dark', 'Fighting'],
     bs: {hp: 65, at: 130, df: 135, sa: 55, sd: 135, sp: 68},
     weightkg: 31.0,
-    abilities: {0: 'Shed Skin'},
+    abilities: {0: 'Intimidate'},
     baseSpecies: 'Scrafty',
   },
   'Skarmory-Mega': {
@@ -10644,7 +10644,7 @@ const ZA_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
     types: ['Fighting', 'Flying'],
     bs: {hp: 85, at: 140, df: 100, sa: 60, sd: 90, sp: 110},
     weightkg: 50.0,
-    abilities: {0: 'Intimidate'},
+    abilities: {0: 'Contrary'},
     baseSpecies: 'Staraptor',
   },
   'Starmie-Mega': {
@@ -10735,6 +10735,7 @@ const CHAMPIONS_LIST = [
   'Altaria-Mega',
   'Ampharos',
   'Ampharos-Mega',
+  'Annihilape',
   'Appletun',
   'Araquanid',
   'Arbok',
@@ -10752,6 +10753,8 @@ const CHAMPIONS_LIST = [
   'Azumarill',
   'Banette',
   'Banette-Mega',
+  'Barbaracle',
+  'Barbaracle-Mega',
   'Basculegion',
   'Basculegion-F',
   'Bastiodon',
@@ -10761,6 +10764,8 @@ const CHAMPIONS_LIST = [
   'Bellibolt',
   'Blastoise',
   'Blastoise-Mega',
+  'Blaziken',
+  'Blaziken-Mega',
   'Camerupt',
   'Camerupt-Mega',
   'Castform',
@@ -10792,11 +10797,15 @@ const CHAMPIONS_LIST = [
   'Delphox-Mega',
   'Diggersby',
   'Ditto',
+  'Dragalge',
+  'Dragalge-Mega',
   'Dragapult',
   'Dragonite',
   'Dragonite-Mega',
   'Drampa',
   'Drampa-Mega',
+  'Eelektross',
+  'Eelektross-Mega',
   'Emboar',
   'Emboar-Mega',
   'Emolga',
@@ -10805,6 +10814,8 @@ const CHAMPIONS_LIST = [
   'Espeon',
   'Excadrill',
   'Excadrill-Mega',
+  'Falinks',
+  'Falinks-Mega',
   'Farigiraf',
   'Feraligatr',
   'Feraligatr-Mega',
@@ -10827,6 +10838,7 @@ const CHAMPIONS_LIST = [
   'Garganacl',
   'Gengar',
   'Gengar-Mega',
+  'Gholdengo',
   'Glaceon',
   'Glalie',
   'Glalie-Mega',
@@ -10843,6 +10855,7 @@ const CHAMPIONS_LIST = [
   'Gourgeist-Super',
   'Greninja',
   'Greninja-Mega',
+  'Grimmsnarl',
   'Gyarados',
   'Gyarados-Mega',
   'Hatterene',
@@ -10854,6 +10867,7 @@ const CHAMPIONS_LIST = [
   'Hippowdon',
   'Houndoom',
   'Houndoom-Mega',
+  'Houndstone',
   'Hydrapple',
   'Hydreigon',
   'Incineroar',
@@ -10877,11 +10891,15 @@ const CHAMPIONS_LIST = [
   'Lycanroc-Dusk',
   'Lycanroc-Midnight',
   'Machamp',
+  'Malamar',
+  'Malamar-Mega',
   'Mamoswine',
   'Manectric',
   'Manectric-Mega',
   'Maushold',
   'Maushold-Four',
+  'Mawile',
+  'Mawile-Mega',
   'Medicham',
   'Medicham-Mega',
   'Meganium',
@@ -10891,6 +10909,8 @@ const CHAMPIONS_LIST = [
   'Meowstic-F',
   'Meowstic-F-Mega',
   'Meowstic-M-Mega',
+  'Metagross',
+  'Metagross-Mega',
   'Milotic',
   'Mimikyu',
   'Mimikyu-Busted',
@@ -10898,11 +10918,13 @@ const CHAMPIONS_LIST = [
   'Morpeko-Hangry',
   'Mr. Rime',
   'Mudsdale',
+  'Musharna',
   'Ninetales',
   'Ninetales-Alola',
   'Noivern',
   'Oranguru',
   'Orthworm',
+  'Overqwil',
   'Palafin',
   'Palafin-Hero',
   'Pangoro',
@@ -10917,7 +10939,10 @@ const CHAMPIONS_LIST = [
   'Polteageist',
   'Polteageist-Antique',
   'Primarina',
+  'Pyroar',
+  'Pyroar-Mega',
   'Quaquaval',
+  'Qwilfish',
   'Raichu',
   'Raichu-Alola',
   'Rampardos',
@@ -10937,10 +10962,16 @@ const CHAMPIONS_LIST = [
   'Samurott',
   'Samurott-Hisui',
   'Sandaconda',
+  'Sceptile',
+  'Sceptile-Mega',
   'Scizor',
   'Scizor-Mega',
+  'Scolipede',
+  'Scolipede-Mega',
   'Scovillain',
   'Scovillain-Mega',
+  'Scrafty',
+  'Scrafty-Mega',
   'Serperior',
   'Sharpedo',
   'Sharpedo-Mega',
@@ -10961,12 +10992,16 @@ const CHAMPIONS_LIST = [
   'Sneasler',
   'Snorlax',
   'Spiritomb',
+  'Staraptor',
+  'Staraptor-Mega',
   'Starmie',
   'Starmie-Mega',
   'Steelix',
   'Steelix-Mega',
   'Stunfisk',
   'Stunfisk-Galar',
+  'Swampert',
+  'Swampert-Mega',
   'Sylveon',
   'Talonflame',
   'Tauros',
@@ -10993,6 +11028,7 @@ const CHAMPIONS_LIST = [
   'Venusaur-Mega',
   'Victreebel',
   'Victreebel-Mega',
+  'Vileplume',
   'Vivillon',
   'Vivillon-Fancy',
   'Vivillon-Pokeball',

package/src/desc.ts

@@ -895,7 +895,7 @@ function getHazards(gen: Generation, defender: Pokemon, defenderSide: Side) {
   }
 
   if (!defender.hasType('Flying') &&
-      !defender.hasAbility('Magic Guard', 'Levitate') &&
+      !defender.hasAbility('Magic Guard', 'Levitate', 'Eelevate') &&
       !defender.hasItem('Air Balloon')
   ) {
     if (defenderSide.spikes === 1) {

package/src/mechanics/champions.ts

@@ -260,7 +260,7 @@ export function calculateChampions(
       (move.hasType('Electric') &&
         defender.hasAbility('Lightning Rod', 'Motor Drive', 'Volt Absorb')) ||
       (move.hasType('Ground') &&
-        !field.isGravity && defender.hasAbility('Levitate')) ||
+        !field.isGravity && !defender.hasItem('Iron Ball') && defender.hasAbility('Levitate', 'Eelevate')) ||
       (move.flags.bullet && defender.hasAbility('Bulletproof')) ||
       (move.flags.sound && !move.named('Clangorous Soul') && defender.hasAbility('Soundproof')) ||
       (move.priority > 0 && defender.hasAbility('Queenly Majesty', 'Armor Tail')) ||
@@ -775,6 +775,11 @@ export function calculateBPModsChampions(
     desc.attackerAbility = attacker.ability;
   }
 
+  if (attacker.hasAbility('Fire Mane') && move.hasType('Fire')) {
+    bpMods.push(6144);
+    desc.attackerAbility = attacker.ability;
+  }
+
   if (defender.hasAbility('Dry Skin') && move.hasType('Fire')) {
     bpMods.push(5120);
     desc.defenderAbility = defender.ability;
@@ -794,6 +799,12 @@ export function calculateBPModsChampions(
   ) {
     bpMods.push(4915);
     desc.attackerItem = attacker.item;
+  } else if (
+    (attacker.hasItem('Muscle Band') && move.category === 'Physical') ||
+    (attacker.hasItem('Wise Glasses') && move.category === 'Special')
+  ) {
+    bpMods.push(4505);
+    desc.attackerItem = attacker.item;
   }
 
   return bpMods;
@@ -901,6 +912,14 @@ export function calculateAtModsChampions(
     desc.defenderAbility = defender.ability;
   }
 
+  if (
+    (attacker.hasItem('Choice Band') && move.category === 'Physical') ||
+    (attacker.hasItem('Choice Specs') && move.category === 'Special')
+  ) {
+    atMods.push(6144);
+    desc.attackerItem = attacker.item;
+  }
+
   return atMods;
 }
 
@@ -1086,6 +1105,22 @@ export function calculateFinalModsChampions(
     desc.isFriendGuard = true;
   }
 
+  if (attacker.hasItem('Expert Belt') && typeEffectiveness > 1) {
+    finalMods.push(4915);
+    desc.attackerItem = attacker.item;
+  } else if (attacker.hasItem('Life Orb')) {
+    finalMods.push(5324);
+    desc.attackerItem = attacker.item;
+  } else if (attacker.hasItem('Metronome') && move.timesUsedWithMetronome! >= 1) {
+    const timesUsedWithMetronome = Math.floor(move.timesUsedWithMetronome!);
+    if (timesUsedWithMetronome <= 4) {
+      finalMods.push(4096 + timesUsedWithMetronome * 819);
+    } else {
+      finalMods.push(8192);
+    }
+    desc.attackerItem = attacker.item;
+  }
+
   if (move.hasType(getBerryResistType(defender.item)) &&
       (typeEffectiveness > 1 || move.hasType('Normal')) &&
       hitCount === 0 &&

package/src/mechanics/util.ts

@@ -30,7 +30,7 @@ const EV_ITEMS = [
 export function isGrounded(pokemon: Pokemon, field: Field) {
   return (field.isGravity || pokemon.hasItem('Iron Ball') ||
     (!pokemon.hasType('Flying') &&
-      !pokemon.hasAbility('Levitate') &&
+      !pokemon.hasAbility('Levitate', 'Eelevate') &&
       !pokemon.hasItem('Air Balloon')));
 }