mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-11-29 02:06:07 +00:00
quick fix to conditional
This commit is contained in:
parent
f1d018d3a6
commit
6fe8c24e81
@ -5143,7 +5143,7 @@ export class AddArenaTagAttr extends MoveEffectAttr {
|
||||
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, removeOnOverlap: boolean = false) {
|
||||
super(true, MoveEffectTrigger.POST_APPLY);
|
||||
|
||||
this.tagType = tagType;
|
||||
@ -5160,12 +5160,12 @@ export class AddArenaTagAttr extends MoveEffectAttr {
|
||||
|
||||
if (this.removeOnOverlap && user.scene.arena.getTag(this.tagType)) {
|
||||
user.scene.arena.removeTag(this.tagType);
|
||||
}
|
||||
|
||||
} else {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -8279,7 +8279,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, false, false, true)
|
||||
.ignoresProtect()
|
||||
.target(MoveTarget.BOTH_SIDES),
|
||||
new AttackMove(Moves.DRACO_METEOR, Type.DRAGON, MoveCategory.SPECIAL, 130, 90, 5, -1, 0, 4)
|
||||
|
Loading…
Reference in New Issue
Block a user