From 54eed194fd55dd80dc36887904f9189bb5d92454 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Wed, 13 Mar 2024 20:36:25 -0400 Subject: [PATCH] Fix Misty Terrain softlock --- src/field/pokemon.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 1188a6d38..0e537322e 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1546,10 +1546,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } canSetStatus(effect: StatusEffect, quiet: boolean = false): boolean { - if (effect !== StatusEffect.FAINT && this.status) - return false; - if (this.isGrounded() && this.scene.arena.terrain?.terrainType === TerrainType.MISTY) - return false; + if (effect !== StatusEffect.FAINT) { + if (this.status) + return false; + if (this.isGrounded() && this.scene.arena.terrain?.terrainType === TerrainType.MISTY) + return false; + } switch (effect) { case StatusEffect.POISON: