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

Merge 4229a950ea into 10f8967023

Browse Source
This commit is contained in:
VarishKongara 2026-05-08 13:38:20 -04:00 committed by GitHub
commit 199ba1392d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
play.pokemonshowdown.com/src/battle-tooltips.ts
View File

@ -33,7 +33,7 @@ export class ModifiableValue {
this.serverPokemon = serverPokemon;
this.itemName = this.battle.dex.items.get(serverPokemon.item).name;
const ability = serverPokemon.ability || pokemon?.ability || serverPokemon.baseAbility;
const ability = pokemon?.ability || serverPokemon.ability || serverPokemon.baseAbility;
this.abilityName = this.battle.dex.abilities.get(ability).name;
this.weatherName = this.battle.dex.moves.get(battle.weather).exists ?
this.battle.dex.moves.get(battle.weather).name : this.battle.dex.abilities.get(battle.weather).name;