mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-10 17:39:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update toxic spikes status set text to be quiet

Browse Source
This commit is contained in:
Bertie690 2025-08-03 12:28:25 -04:00 committed by GitHub
parent 8b1b1cd38a
commit a82768f040
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/data/arena-tag.ts
View File

@ -930,31 +930,23 @@ class ToxicSpikesTag extends ArenaTrapTag {
return true; return true;
} }
// poison types will neutralize toxic spikes
if (pokemon.isOfType(PokemonType.POISON)) { if (pokemon.isOfType(PokemonType.POISON)) {
// Neutralize the tag and remove it from the field.
// Message cannot be moved to `onRemove` as that requires a reference to the neutralizing pokemon
this.#neutralized = true; this.#neutralized = true;
if (globalScene.arena.removeTag(this.tagType)) { globalScene.arena.removeTagOnSide(this.tagType, this.side)
globalScene.phaseManager.queueMessage( globalScene.phaseManager.queueMessage(
i18next.t("arenaTag:toxicSpikesActivateTrapPoison", { i18next.t("arenaTag:toxicSpikesActivateTrapPoison", {
pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
moveName: this.getMoveName(), moveName: this.getMoveName(),
}), }),
); );
}
return true; return true;
} }
if (pokemon.status) { // Attempt to poison the target, suppressing any immunity messages that arise.
return false; const effect = this.layers === 1 ? StatusEffect.POISON : StatusEffect.TOXIC;
} return pokemon.trySetStatus(effect, null, undefined, this.getMoveName(), false, true)
// TODO: pass quiet to the function
return pokemon.trySetStatus(
this.layers === 1 ? StatusEffect.POISON : StatusEffect.TOXIC,
null,
undefined,
this.getMoveName(),
);
} }
getMatchupScoreMultiplier(pokemon: Pokemon): number { getMatchupScoreMultiplier(pokemon: Pokemon): number {