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 2caba4a22c into 530765fc12

Browse Source
This commit is contained in:
André Bastos Dias 2026-04-26 21:41:58 +05:00 committed by GitHub
commit 9998797d48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1922,10 +1922,10 @@ export class BattleTooltips {
if (this.battle.hasPseudoWeather('Psychic Terrain') && target.isGrounded() && priority > 0) {
otherFactor = 0;
}
if (this.battle.weather === 'primordialsea' && attackType === 'Fire') {
if (this.battle.weather === 'primordialsea' && attackType === 'Fire' && move.category !== 'Status') {
otherFactor = 0;
}
if (this.battle.weather === 'desolateland' && attackType === 'Water') {
if (this.battle.weather === 'desolateland' && attackType === 'Water' && move.category !== 'Status') {
otherFactor = 0;
}