Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tooltips for Crystal Free Z-Moves (#2575)

Browse Source
This commit is contained in:
fish 2026-03-16 03:03:42 -04:00 committed by GitHub
parent ddfd9034a8
commit 54a573b815
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
play.pokemonshowdown.com/src/battle.ts
View File

@ -1527,11 +1527,13 @@ export class Battle {
if (!fromeffect.id || callerMoveForPressure || fromeffect.id === 'pursuit') { if (!fromeffect.id || callerMoveForPressure || fromeffect.id === 'pursuit') {
let moveName = move.name; let moveName = move.name;
if (!callerMoveForPressure) { if (!callerMoveForPressure) {
if (move.isZ) { const previousLine = this.stepQueue[this.currentStep - 1];
const zPower = previousLine.startsWith('|-zpower');
if (move.isZ && zPower) {
pokemon.item = move.isZ; pokemon.item = move.isZ;
let item = Dex.items.get(move.isZ); let item = Dex.items.get(move.isZ);
if (item.zMoveFrom) moveName = item.zMoveFrom; if (item.zMoveFrom) moveName = item.zMoveFrom;
} else if (move.name.startsWith('Z-')) { } else if (move.name.startsWith('Z-') && zPower) {
moveName = moveName.slice(2); moveName = moveName.slice(2);
move = Dex.moves.get(moveName); move = Dex.moves.get(moveName);
if (window.BattleItems) { if (window.BattleItems) {