Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-02 15:53:11 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tooltips: Calculate Speed correctly for CGT (#2062)

Browse Source
This commit is contained in:
pyuk-bot
2022-12-22 18:57:00 -06:00
committed by GitHub
parent c3bd856af8
commit 795d5aedc8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle-tooltips.ts
View File

@@ -1349,8 +1349,9 @@ class BattleTooltips {
let level = pokemon.volatiles.transform?.[4] || pokemon.level;
let tier = this.battle.tier;
let gen = this.battle.gen;
let isCGT = tier.includes('Computer-Generated Teams');
let isRandomBattle = tier.includes('Random Battle') ||
(tier.includes('Random') && tier.includes('Battle') && gen >= 6);
(tier.includes('Random') && tier.includes('Battle') && gen >= 6) || isCGT;
let minNature = (isRandomBattle || gen < 3) ? 1 : 0.9;
let maxNature = (isRandomBattle || gen < 3) ? 1 : 1.1;
@@ -1365,8 +1366,8 @@ class BattleTooltips {
else if (tier.includes('Random')) max += 20;
} else {
let maxIvEvOffset = maxIv + ((isRandomBattle && gen >= 3) ? 21 : 63);
min = tr(tr(2 * baseSpe * level / 100 + 5) * minNature);
max = tr(tr((2 * baseSpe + maxIvEvOffset) * level / 100 + 5) * maxNature);
min = isCGT ? max : tr(tr(2 * baseSpe * level / 100 + 5) * minNature);
}
return [min, max];
}