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

Always allow canceling a switch with Shed Shell (#11365)
Some checks are pending
Node.js CI / build (18.x) (push) Waiting to run
Details

Browse Source
This commit is contained in:
pyuk-bot
2025-08-12 18:57:37 -05:00
committed by GitHub
parent 99c0799376
commit 1ee9efa2c8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/items.ts
View File

@@ -5242,7 +5242,11 @@ export const Items: import('../sim/dex-items').ItemDataTable = {
},
onTrapPokemonPriority: -10,
onTrapPokemon(pokemon) {
pokemon.trapped = pokemon.maybeTrapped = false;
pokemon.trapped = false;
},
onMaybeTrapPokemonPriority: -10,
onMaybeTrapPokemon(pokemon) {
pokemon.maybeTrapped = false;
},
num: 295,
gen: 4,

1
sim/dex-conditions.ts
View File

@@ -459,6 +459,7 @@ export interface EventMethods {
onFractionalPriorityPriority?: number;
onHitPriority?: number;
onInvulnerabilityPriority?: number;
onMaybeTrapPokemonPriority?: number;
onModifyAccuracyPriority?: number;
onModifyAtkPriority?: number;
onModifyCritRatioPriority?: number;