diff --git a/src/data/move.ts b/src/data/move.ts index 020e6359d16..ff0c24f5032 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -5149,16 +5149,14 @@ export class AddArenaTagAttr extends MoveEffectAttr { public tagType: ArenaTagType; public turnCount: integer; private failOnOverlap: boolean; - private removeOnOverlap: boolean; public selfSideTarget: boolean; - constructor(tagType: ArenaTagType, turnCount?: integer | null, failOnOverlap: boolean = false, removeOnOverlap: boolean = false, selfSideTarget: boolean = false) { + constructor(tagType: ArenaTagType, turnCount?: integer | null, failOnOverlap: boolean = false, selfSideTarget: boolean = false) { super(true, MoveEffectTrigger.POST_APPLY); this.tagType = tagType; this.turnCount = turnCount!; // TODO: is the bang correct? this.failOnOverlap = failOnOverlap; - this.removeOnOverlap = removeOnOverlap; this.selfSideTarget = selfSideTarget; } @@ -5167,10 +5165,6 @@ export class AddArenaTagAttr extends MoveEffectAttr { return false; } - if (this.removeOnOverlap && user.scene.arena.getTag(this.tagType)) { - user.scene.arena.removeTag(this.tagType); - } - if ((move.chance < 0 || move.chance === 100 || user.randSeedInt(100) < move.chance) && user.getLastXMoves(1)[0].result === MoveResult.SUCCESS) { user.scene.arena.addTag(this.tagType, this.turnCount, move.id, user.id, (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY); return true; @@ -8288,7 +8282,7 @@ export function initMoves() { .attr(RemoveScreensAttr, false) .attr(RemoveArenaTrapAttr, true), new StatusMove(Moves.TRICK_ROOM, Type.PSYCHIC, -1, 5, -1, -7, 4) - .attr(AddArenaTagAttr, ArenaTagType.TRICK_ROOM, 5, false, true) + .attr(AddArenaTagAttr, ArenaTagType.TRICK_ROOM, 5) .ignoresProtect() .target(MoveTarget.BOTH_SIDES), new AttackMove(Moves.DRACO_METEOR, Type.DRAGON, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4)