EiPP Clause fix

multihits should trigger EiPP clause for all hits, not just first
Celestia74 · Nov 9, 2024 · 0b7c3f8 · 0b7c3f8
1 parent 5835821
commit 0b7c3f8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@smogon/calc.svg)](https://www.npmjs.com/package/@smogon/calc)&nbsp;
 
-Damage calculator and soon-to-be multipurpose tool for Everyone is Pokémon Pokémon.
+Modified damage calculator for Everyone is Pokémon Pokémon.
 
 Fork of [smogon/damage-calc][0].
 

diff --git a/calc/src/mechanics/gen4.ts b/calc/src/mechanics/gen4.ts
@@ -325,6 +325,9 @@ export function calculateDPP(
         newFinalDamage = Math.floor(newFinalDamage * filterMod);
         newFinalDamage = Math.floor(newFinalDamage * ebeltMod);
         newFinalDamage = Math.floor(newFinalDamage * tintedMod);
+        if (move.timesUsed! === 1) {
+    		newFinalDamage = Math.floor(newFinalDamage * dwcMod);
+        }
         newFinalDamage = Math.max(1, newFinalDamage);
         damageMultiplier++;
         return affectedAmount + newFinalDamage;

diff --git a/calc/src/mechanics/gen56.ts b/calc/src/mechanics/gen56.ts
@@ -1129,7 +1129,7 @@ function calculateFinalModsBWXY(
     desc.defenderItem = defender.item;
   }
 
- if (typeEffectiveness === 4 && field.defenderSide.isDWC === true && hitCount === 0) {
+ if (typeEffectiveness === 4 && field.defenderSide.isDWC === true && (move.timesUsed! === 1 || move.timesUsed! >1 && hitCount === 0)) {
   finalMods.push(2048);
   desc.dwc = true;
   }

diff --git a/calc/src/mechanics/gen789.ts b/calc/src/mechanics/gen789.ts
@@ -1777,7 +1777,7 @@ export function calculateFinalModsSMSSSV(
     desc.defenderItem = defender.item;
   }
 
- if (typeEffectiveness === 4 && field.defenderSide.isDWC === true && hitCount === 0) {
+ if (typeEffectiveness === 4 && field.defenderSide.isDWC === true && (move.timesUsed! === 1 || move.timesUsed! >1 && hitCount === 0)) {
   finalMods.push(2048);
   desc.dwc = true;
   }

diff --git a/src/base.template.html b/src/base.template.html
@@ -1643,7 +1643,8 @@
     <script type="text/javascript" src="./js/moveset_import.js?"></script>
 </div>
 
-<div class="credits">Created by Honko, maintained by Austin and Kris <br> EiPP Mod by Celestia
+<div class="credits">Created by Honko, maintained by Austin and Kris
+	<br> EiPP Mod by Celestia </br>
     <ul><li><a href="https://github.com/smogon/damage-calc/contributors" class="links-lighten" target="_blank">Contributors</a></li>
     <li><a href="https://github.com/Celestia74/eipp-calc" class="links-lighten" target="_blank">GitHub repository</a></li></ul>