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

Tooltips: Properly prevent duplicate ability display (#1362)

Browse Source
This commit is contained in:
asgdf
2019-09-09 06:34:48 +02:00
committed by Guangcong Luo
parent a7b09818e9
commit a5a06e5729
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle-tooltips.ts
View File

@@ -1577,7 +1577,7 @@ class BattleTooltips {
if (clientPokemon) {
if (clientPokemon.ability) {
abilityData.ability = clientPokemon.ability || clientPokemon.baseAbility;
if (clientPokemon.baseAbility && clientPokemon.baseAbility !== abilityData.ability) {
if (clientPokemon.baseAbility) {
abilityData.baseAbility = clientPokemon.baseAbility;
}
} else {
@@ -1593,7 +1593,7 @@ class BattleTooltips {
}
if (serverPokemon) {
if (!abilityData.ability) abilityData.ability = serverPokemon.ability || serverPokemon.baseAbility;
if (!abilityData.baseAbility && serverPokemon.baseAbility && serverPokemon.baseAbility !== abilityData.ability) {
if (!abilityData.baseAbility && serverPokemon.baseAbility) {
abilityData.baseAbility = serverPokemon.baseAbility;
}
}
@@ -1612,8 +1612,10 @@ class BattleTooltips {
if (ability) text = '<small>Ability:</small> ' + Dex.getAbility(ability).name;
} else {
if (abilityData.ability) {
text = '<small>Ability:</small> ' + Dex.getAbility(abilityData.ability).name;
if (abilityData.baseAbility) text += ' (base: ' + Dex.getAbility(abilityData.baseAbility).name + ')';
const abilityName = Dex.getAbility(abilityData.ability).name;
text = '<small>Ability:</small> ' + abilityName;
const baseAbilityName = Dex.getAbility(abilityData.baseAbility).name;
if (baseAbilityName && baseAbilityName !== abilityName) text += ' (base: ' + baseAbilityName + ')';
}
}
if (!text && abilityData.possibilities.length) {