Recharge move nerf

ShivaD173 · Oct 17, 2024 · 4e2c610 · 4e2c610
1 parent 4a178e5
commit 4e2c610
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/calc/src/data/moves.ts b/calc/src/data/moves.ts
@@ -4975,6 +4975,9 @@ const GAY_PATCH = {
   'Wring Out': {category: 'Physical'},
   'Needle Arm': {bp: 90},
   'Present': {bp: 80},
+  'Dragon Hammer': {bp: 100},
+  'Blazing Torque': {bp: 100},
+  'Wicked Torque': {bp: 100},
   'Electro Shot': {bp: 120},
   'Aeroblast': {bp: 90},
   'Wicked Blow': {bp: 69},
@@ -4994,9 +4997,8 @@ const GAY_PATCH = {
   'Storm Throw': {bp: 70},
   'Origin Pulse': {bp: 100},
   'Shadow Bone': {bp: 50, multihit: 2},
-  'Dragon Darts': {bp: 55},
-  'Twin Beam': {bp: 55},
-  'Diamond Storm': {bp: 95, category: 'Special'},
+  'Twin Beam': {bp: 50},
+  'Diamond Storm': {bp: 95, category: 'Special', target: 'normal'},
   'Double Shock': {bp: 130},
   'Revelation Dance': {bp: 100},
   'Volt Tackle': {bp: 130},
@@ -5012,18 +5014,20 @@ const GAY_PATCH = {
   'G-Max Gravitas': {bp: 90, category: 'Special'},
   'G-Max Finale': {bp: 80, category: 'Special'},
   'G-Max Depletion': {bp: 90, category: 'Special'},
-  'Hyper Beam': {bp: 140},
-  'Giga Impact': {bp: 140},
-  'Frenzy Plant': {bp: 140},
-  'Hydro Cannon': {bp: 140},
-  'Blast Burn': {bp: 140},
-  'Rock Wrecker': {bp: 140},
-  'Meteor Assault': {bp: 150},
-  'Prismatic Laser': {bp: 140},
+  'Hyper Beam': {bp: 130},
+  'Giga Impact': {bp: 130},
+  'Frenzy Plant': {bp: 130},
+  'Hydro Cannon': {bp: 130},
+  'Blast Burn': {bp: 130},
+  'Rock Wrecker': {bp: 130},
+  'Meteor Assault': {bp: 130},
+  'Prismatic Laser': {bp: 130},
   'Eternabeam': {bp: 180},
   'Spectral Thief': {bp: 100},
   'Hyperspace Hole': {bp: 90},
   'Confusion': {bp: 30},
+  'Roar of Time': {bp: 140},
+  'Spacial Rend': {bp: 95},
   'Relic Song': {bp: 90},
   'Double Iron Bash': {bp: 50},
   'Astral Barrage': {bp: 100},

diff --git a/calc/src/mechanics/gen789.ts b/calc/src/mechanics/gen789.ts
@@ -1048,6 +1048,10 @@ export function calculateBPModsSMSSSV(
     move.target = 'allAdjacentFoes';
     bpMods.push(6144);
     desc.moveBP = basePower * 1.5;
+  } else if (
+    move.named('Diamond Storm') && isGrounded(attacker, field) && field.hasWeather('Sand')
+  ) {
+    move.target = 'allAdjacentFoes';
   } else if ((move.named('Knock Off') && !resistedKnockOffDamage) ||
     (move.named('Misty Explosion') && isGrounded(attacker, field) && field.hasTerrain('Misty')) ||
     (move.named('Grav Apple') && field.isGravity)
@@ -1161,6 +1165,7 @@ export function calculateBPModsSMSSSV(
     (attacker.hasAbility('Mega Launcher') && (move.flags.pulse || move.flags.bullet || move.name.endsWith('Cannon'))) ||
     (attacker.hasAbility('Analytic') &&
       (turnOrder !== 'first' || field.defenderSide.isSwitching === 'out')) ||
+    (attacker.hasAbility('Hammer Time') && move.name.toLowerCase().includes('hammer')) ||
     (attacker.hasAbility('Tough Claws') && move.flags.contact)
   ) {
     bpMods.push(5325);
@@ -1173,7 +1178,6 @@ export function calculateBPModsSMSSSV(
     (attacker.hasAbility('Punk Rock') && move.flags.sound) ||
     (attacker.hasAbility('Honey Gather') && move.named('Pollen Puff')) ||
     (attacker.hasAbility('True Aurora') && move.named('Aurora Beam')) ||
-    (attacker.hasAbility('Hammer Time') && move.name.toLowerCase().includes('hammer')) ||
     (attacker.hasAbility('Just the Tip') && move.name.toLowerCase().includes('drill')) ||
     (attacker.hasAbility('Grass Pelt') && field.hasTerrain('Grassy'))
   ) {