From 0aff988241a81d0919bc706b79bbd7d769da4851 Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Wed, 9 Oct 2024 22:38:43 -0700 Subject: [PATCH] Apply suggestions from code review Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com> --- src/data/battler-tags.ts | 4 +--- src/data/move.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 484def39514..6d6fa434b11 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -2697,9 +2697,7 @@ export class TelekinesisTag extends BattlerTag { } override onRemove(pokemon: Pokemon) { - if (pokemon.getTag(BattlerTagType.FLOATING)) { - pokemon.removeTag(BattlerTagType.FLOATING); - } + pokemon.removeTag(BattlerTagType.FLOATING); } } diff --git a/src/data/move.ts b/src/data/move.ts index b406cb978c9..94a8a12f16f 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -8389,7 +8389,7 @@ export function initMoves() { new StatusMove(Moves.TELEKINESIS, Type.PSYCHIC, -1, 15, -1, 0, 5) .condition(failOnGravityCondition) .condition((_user, target, _move) => ![ Species.DIGLETT, Species.DUGTRIO, Species.ALOLA_DIGLETT, Species.ALOLA_DUGTRIO, Species.SANDYGAST, Species.PALOSSAND, Species.WIGLETT, Species.WUGTRIO ].includes(target.species.speciesId)) - .condition((_user, target, _move) => (target.species.speciesId !== Species.GENGAR && target.getFormKey() !== "mega")) + .condition((_user, target, _move) => !(target.species.speciesId === Species.GENGAR && target.getFormKey() === "mega")) .condition((_user, target, _move) => Utils.isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && Utils.isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING))) .attr(AddBattlerTagAttr, BattlerTagType.TELEKINESIS, false, false, 3), new StatusMove(Moves.MAGIC_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5)