Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-14 06:49:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tooltips: Fix Rivalry and Power Trip/Stored Power (#1231)

Browse Source
This commit is contained in:
asgdf
2019-02-19 22:22:17 +01:00
committed by Guangcong Luo
parent f6038e7083
commit 3e4fe5fa1d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle-tooltips.ts
View File

@@ -1213,7 +1213,7 @@ class BattleTooltips {
}
if (['storedpower', 'powertrip'].includes(move.id) && target) {
let boostCount = 0;
for (const boost of Object.values(target.boosts)) {
for (const boost of Object.values(pokemon.boosts)) {
if (boost > 0) boostCount += boost;
}
value.set(20 + 20 * boostCount);
@@ -1338,9 +1338,9 @@ class BattleTooltips {
}
if (target) {
if (["MF", "FM"].includes(pokemon.gender + target.gender)) {
value.abilityModify(1.25, "Rivalry");
} else if (["MM", "FF"].includes(pokemon.gender + target.gender)) {
value.abilityModify(0.75, "Rivalry");
} else if (["MM", "FF"].includes(pokemon.gender + target.gender)) {
value.abilityModify(1.25, "Rivalry");
}
}
const noTypeOverride = ['judgment', 'multiattack', 'naturalgift', 'revelationdance', 'struggle', 'technoblast', 'weatherball'];