Nature Power fixes (#457)

* Nature Power fixes * Fix gen 3 category and remove bp hardcode * Set move.secondaries to true where appropriate * Nature power can't be psychic in gen 6 * Nature Power does not turn into Psychic in gen 6
smogon · Nov 6, 2022 · 848aa9a · 848aa9a
1 parent dfdaff8
commit 848aa9a
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 19 deletions.
diff --git a/calc/src/mechanics/gen3.ts b/calc/src/mechanics/gen3.ts
@@ -124,6 +124,11 @@ export function calculateADV(
       desc.moveBP = bp;
     }
     break;
+  case 'Nature Power':
+    move.category = 'Physical';
+    bp = 60;
+    desc.moveName = 'Swift';
+    break;
   default:
     bp = move.bp;
   }

diff --git a/calc/src/mechanics/gen4.ts b/calc/src/mechanics/gen4.ts
@@ -209,6 +209,12 @@ export function calculateDPP(
       desc.moveBP = basePower;
     }
     break;
+  case 'Nature Power':
+    move.category = 'Special';
+    move.secondaries = true;
+    basePower = 80;
+    desc.moveName = 'Tri Attack';
+    break;
   case 'Crush Grip':
   case 'Wring Out':
     basePower = Math.floor((defender.curHP() * 120) / defender.maxHP()) + 1;

diff --git a/calc/src/mechanics/gen56.ts b/calc/src/mechanics/gen56.ts
@@ -116,12 +116,15 @@ export function calculateBWXY(
     desc.moveBP = move.bp;
     desc.moveType = move.type;
   } else if (move.named('Nature Power')) {
-    move.type =
-      field.hasTerrain('Electric') ? 'Electric'
-      : field.hasTerrain('Grassy') ? 'Grass'
-      : field.hasTerrain('Misty') ? 'Fairy'
-      : field.hasTerrain('Psychic') ? 'Psychic'
-      : 'Normal';
+    if (gen.num === 5) {
+      move.type = 'Ground';
+    } else {
+      move.type =
+        field.hasTerrain('Electric') ? 'Electric'
+        : field.hasTerrain('Grassy') ? 'Grass'
+        : field.hasTerrain('Misty') ? 'Fairy'
+        : 'Normal';
+    }
   }
 
   let isAerilate = false;
@@ -358,10 +361,32 @@ export function calculateBWXY(
     desc.moveBP = basePower;
     break;
   case 'Nature Power':
-    basePower =
-        field.terrain && field.hasTerrain('Electric', 'Grassy') ? 90
-        : field.hasTerrain('Misty') ? 95
-        : 80; // Tri Attack
+    if (gen.num === 5) {
+      move.category = 'Physical';
+      move.target = 'allAdjacent';
+      basePower = 100;
+      desc.moveName = 'Earthquake';
+    } else {
+      move.category = 'Special';
+      move.secondaries = true;
+      switch (field.terrain) {
+      case 'Electric':
+        basePower = 90;
+        desc.moveName = 'Thunderbolt';
+        break;
+      case 'Grassy':
+        basePower = 90;
+        desc.moveName = 'Energy Ball';
+        break;
+      case 'Misty':
+        basePower = 95;
+        desc.moveName = 'Moonblast';
+        break;
+      default:
+        basePower = 80;
+        desc.moveName = 'Tri Attack';
+      }
+    }
     break;
   // Triple Kick's damage doubles after each consecutive hit (10, 20, 30), this is a hack
   case 'Triple Kick':

diff --git a/calc/src/mechanics/gen78.ts b/calc/src/mechanics/gen78.ts
@@ -690,11 +690,29 @@ export function calculateBasePowerSMSS(
     }
     break;
   case 'Nature Power':
-    basePower =
-        field.terrain && field.hasTerrain('Electric', 'Grassy', 'Psychic') ? 90
-        : field.hasTerrain('Misty') ? 95
-        : 80; // Tri Attack
-    desc.moveBP = basePower;
+    move.category = 'Special';
+    move.secondaries = true;
+    switch (field.terrain) {
+    case 'Electric':
+      basePower = 90;
+      desc.moveName = 'Thunderbolt';
+      break;
+    case 'Grassy':
+      basePower = 90;
+      desc.moveName = 'Energy Ball';
+      break;
+    case 'Misty':
+      basePower = 95;
+      desc.moveName = 'Moonblast';
+      break;
+    case 'Psychic':
+      basePower = 90;
+      desc.moveName = 'Psychic';
+      break;
+    default:
+      basePower = 80;
+      desc.moveName = 'Tri Attack';
+    }
     break;
   case 'Water Shuriken':
     basePower = attacker.named('Greninja-Ash') && attacker.hasAbility('Battle Bond') ? 20 : 15;

diff --git a/calc/src/move.ts b/calc/src/move.ts
@@ -156,10 +156,6 @@ export class Move implements State.Move {
       // Assume max happiness for these moves because the calc doesn't support happiness
       if (['return', 'frustration', 'pikapapow', 'veeveevolley'].includes(data.id)) {
         this.bp = 102;
-      } else if (data.id === 'naturepower') {
-        // Assume the 'Wi-Fi' default of Tri Attack
-        this.bp = 80;
-        if (gen.num >= 5) this.secondaries = true;
       }
     }
   }