IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for Psychic Terrain blocking Protect Moves

pull/97/head
spongario 2024-04-11 23:04:17 -04:00 committed by Samuel H
parent 58ef8f5aec
commit 07ff22e53d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/data/terrain.ts
View File

@ -3,6 +3,7 @@ import Move from "./move";
import { Type } from "./type"; import { Type } from "./type";
import * as Utils from "../utils"; import * as Utils from "../utils";
import { IncrementMovePriorityAbAttr, applyAbAttrs } from "./ability"; import { IncrementMovePriorityAbAttr, applyAbAttrs } from "./ability";
import { ProtectAttr } from "./move";
export enum TerrainType { export enum TerrainType {
NONE, NONE,
@ -50,9 +51,12 @@ export class Terrain {
isMoveTerrainCancelled(user: Pokemon, move: Move): boolean { isMoveTerrainCancelled(user: Pokemon, move: Move): boolean {
switch (this.terrainType) { switch (this.terrainType) {
case TerrainType.PSYCHIC: case TerrainType.PSYCHIC:
const priority = new Utils.IntegerHolder(move.priority); if (!move.getAttrs(ProtectAttr).length )
applyAbAttrs(IncrementMovePriorityAbAttr, user, null, move, priority); {
return priority.value > 0; const priority = new Utils.IntegerHolder(move.priority);
applyAbAttrs(IncrementMovePriorityAbAttr, user, null, move, priority);
return priority.value > 0;
}
} }
return false; return false;