From 35c1fbc36634d5ed9ae7dbc5a099efec7670adeb Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Mon, 30 Mar 2026 03:33:32 +0000 Subject: [PATCH] Only show "no effect" on buttons --- .../src/battle-tooltips.ts | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/play.pokemonshowdown.com/src/battle-tooltips.ts b/play.pokemonshowdown.com/src/battle-tooltips.ts index da5abddff..26f9ec3a7 100644 --- a/play.pokemonshowdown.com/src/battle-tooltips.ts +++ b/play.pokemonshowdown.com/src/battle-tooltips.ts @@ -1946,23 +1946,28 @@ export class BattleTooltips { foeActive = [...foeActive, ...pokemon.side.active].filter(active => active !== pokemon); } - let tags = ''; + let tags = '\u00D7'; for (const possibleTarget of foeActive) { if (!possibleTarget) continue; const effectiveness = this.getMoveEffectiveness(pokemon, move, moveType, category, possibleTarget); - if (effectiveness === 0) { - tags += `\u00D7`; - } else if (effectiveness < 0.5) { - tags += `\u25BC`; - } else if (effectiveness < 1) { - tags += `\u25B3`; - } else if (effectiveness > 2) { - tags += `\u2605`; - } else if (effectiveness > 1) { - tags += `\u29BF`; - } else if (category !== 'Status') { - tags += `\u25CB`; + if (effectiveness !== 0) { + tags = ''; + break; } + + // if (effectiveness === 0) { + // tags += `\u00D7`; + // } else if (effectiveness < 0.5) { + // tags += `\u25BC`; + // } else if (effectiveness < 1) { + // tags += `\u25B3`; + // } else if (effectiveness > 2) { + // tags += `\u2605`; + // } else if (effectiveness > 1) { + // tags += `\u29BF`; + // } else if (category !== 'Status') { + // tags += `\u25CB`; + // } } return [moveType, tags] as const;