added iron ball check to immunity checks, made terrain pulse only tak…

…e terrain type for grounded pokemon
jbmagier · Mar 28, 2021 · 913c489 · 913c489
1 parent 086326f
commit 913c489
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/calc/src/mechanics/gen78.ts b/calc/src/mechanics/gen78.ts
@@ -154,7 +154,7 @@ export function calculateSMSS(
     desc.attackerItem = attacker.item;
     desc.moveBP = move.bp;
     desc.moveType = move.type;
-  } else if (move.named('Nature Power', 'Terrain Pulse')) {
+  } else if (move.named('Nature Power') || (move.named('Terrain Pulse') && isGrounded(attacker, field))) {
     move.type =
       field.hasTerrain('Electric') ? 'Electric'
       : field.hasTerrain('Grassy') ? 'Grass'
@@ -234,6 +234,8 @@ export function calculateSMSS(
     } else if (defender.types[1] && effectiveness[defender.types[1]]! === 0) {
       typeEffectiveness = type1Effectiveness;
     }
+  } else if (typeEffectiveness === 0 && move.hasType('Ground') && defender.hasItem('Iron Ball')) {
+    typeEffectiveness = 1;
   }
 
   if (typeEffectiveness === 0) {
@@ -256,7 +258,8 @@ export function calculateSMSS(
       (move.hasType('Electric') &&
         defender.hasAbility('Lightning Rod', 'Motor Drive', 'Volt Absorb')) ||
       (move.hasType('Ground') &&
-        !field.isGravity && !move.named('Thousand Arrows') && defender.hasAbility('Levitate')) ||
+        !field.isGravity && !defender.hasItem('Iron Ball') &&
+        !move.named('Thousand Arrows') && defender.hasAbility('Levitate')) ||
       (move.flags.bullet && defender.hasAbility('Bulletproof')) ||
       (move.flags.sound && !move.named('Clangorous Soul') && defender.hasAbility('Soundproof')) ||
       (move.priority > 0 && defender.hasAbility('Queenly Majesty', 'Dazzling'))
@@ -648,7 +651,7 @@ export function calculateBasePowerSMSS(
     desc.moveBP = basePower;
     break;
   case 'Terrain Pulse':
-    basePower = move.bp * (field.terrain ? 2 : 1);
+    basePower = move.bp * (field.terrain && isGrounded(attacker, field) ? 2 : 1);
     desc.moveBP = basePower;
     break;
   case 'Fling':