From bb6144ab8a86bcab368d0da581395437397b378b Mon Sep 17 00:00:00 2001 From: Shiva Devarajan Date: Sun, 3 Dec 2023 14:33:44 -0500 Subject: [PATCH 1/2] Fix Multihit in Honkalculate --- src/js/honkalculate_controls.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/honkalculate_controls.js b/src/js/honkalculate_controls.js index 2115c556e..f023a1156 100644 --- a/src/js/honkalculate_controls.js +++ b/src/js/honkalculate_controls.js @@ -97,8 +97,8 @@ function performCalculations() { for (var n = 0; n < 4; n++) { result = damageResults[n]; minMaxDamage = result.range(); - minDamage = minMaxDamage[0] * attacker.moves[n].hits; - maxDamage = minMaxDamage[1] * attacker.moves[n].hits; + minDamage = minMaxDamage[0]; + maxDamage = minMaxDamage[1]; minPercentage = Math.floor(minDamage * 1000 / defender.maxHP()) / 10; maxPercentage = Math.floor(maxDamage * 1000 / defender.maxHP()) / 10; minPixels = Math.floor(minDamage * 48 / defender.maxHP()); From 4728befc8d02f5b6418c8b60c6200d79973a74af Mon Sep 17 00:00:00 2001 From: Shiva Devarajan Date: Sun, 3 Dec 2023 14:33:59 -0500 Subject: [PATCH 2/2] Fix Gorilla Tactics in Weather --- calc/src/mechanics/gen789.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/calc/src/mechanics/gen789.ts b/calc/src/mechanics/gen789.ts index 719f2cdbe..32871d114 100644 --- a/calc/src/mechanics/gen789.ts +++ b/calc/src/mechanics/gen789.ts @@ -1230,13 +1230,16 @@ export function calculateAtModsSMSSSV( (attacker.named('Cherrim') && attacker.hasAbility('Flower Gift') && field.hasWeather('Sun', 'Harsh Sunshine') && - move.category === 'Physical') || + move.category === 'Physical')) { + atMods.push(6144); + desc.attackerAbility = attacker.ability; + desc.weather = field.weather; + } else if ( // Gorilla Tactics has no effect during Dynamax (Anubis) (attacker.hasAbility('Gorilla Tactics') && move.category === 'Physical' && !attacker.isDynamaxed)) { atMods.push(6144); desc.attackerAbility = attacker.ability; - desc.weather = field.weather; } else if ( field.attackerSide.isFlowerGift && field.hasWeather('Sun', 'Harsh Sunshine') &&