From fb2e1267a90a8f1f93b224265cd643272d3e1c71 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Fri, 21 Feb 2025 14:27:28 -0600 Subject: [PATCH] Fix expected hit count for pop-bomb like moves Accuracy is now properly divided by 100 --- src/data/move.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 4fe68c02386..27304c98674 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2397,10 +2397,12 @@ export class MultiHitAttr extends MoveAttr { if (ignoreAcc || move.accuracy === -1) { return expectedHits; } + const acc = move.accuracy / 100; if (move.hasFlag(MoveFlags.CHECK_ALL_HITS) && !maxMultiHit) { - return Math.pow(move.accuracy, expectedHits); + // N.B. No moves should be the _2_TO_5 variant have the CHECK_ALL_HITS flag. + return acc * (1 - Math.pow(acc, expectedHits)) / (1 - acc); } - return expectedHits *= move.accuracy / 100; + return expectedHits *= acc; } }