Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-08-20 16:14:34 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update accuracy calculation for latest Gen 7 research (#7806)

Browse Source
This commit is contained in:
urkerab
2020-12-15 23:37:24 +00:00
committed by GitHub
parent 721a48ea38
commit 74ae95a91c
9 changed files with 284 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/scripts.ts
View File

@@ -452,31 +452,23 @@ export const Scripts: BattleScriptsData = {
}
}
} else {
const boostTable = [1, 4 / 3, 5 / 3, 2, 7 / 3, 8 / 3, 3];
let boosts;
let boost!: number;
accuracy = this.runEvent('ModifyAccuracy', target, pokemon, move, accuracy);
if (accuracy !== true) {
let boost = 0;
if (!move.ignoreAccuracy) {
boosts = this.runEvent('ModifyBoost', pokemon, null, null, {...pokemon.boosts});
const boosts = this.runEvent('ModifyBoost', pokemon, null, null, {...pokemon.boosts});
boost = this.clampIntRange(boosts['accuracy'], -6, 6);
if (boost > 0) {
accuracy *= boostTable[boost];
} else {
accuracy /= boostTable[-boost];
}
}
if (!move.ignoreEvasion) {
boosts = this.runEvent('ModifyBoost', target, null, null, {...target.boosts});
boost = this.clampIntRange(boosts['evasion'], -6, 6);
if (boost > 0) {
accuracy /= boostTable[boost];
} else if (boost < 0) {
accuracy *= boostTable[-boost];
}
const boosts = this.runEvent('ModifyBoost', target, null, null, {...target.boosts});
boost = this.clampIntRange(boost - boosts['evasion'], -6, 6);
}
if (boost > 0) {
accuracy = this.trunc(accuracy * (3 + boost) / 3);
} else if (boost < 0) {
accuracy = this.trunc(accuracy * 3 / (3 - boost));
}
}
accuracy = this.runEvent('ModifyAccuracy', target, pokemon, move, accuracy);
}
if (move.alwaysHit || (move.id === 'toxic' && this.gen >= 6 && pokemon.hasType('Poison'))) {
accuracy = true; // bypasses ohko accuracy modifiers