From fefd115d550b6407cae14dff471f3bdf22e919c8 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Tue, 30 Apr 2024 11:46:22 -0400 Subject: [PATCH] Formatting changes for consistency --- src/data/ability.ts | 19 ++++++++----------- src/data/move.ts | 6 +++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 9faf0a5ce14..2ac7d6be1ac 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -988,7 +988,7 @@ export class BattleStatMultiplierAbAttr extends AbAttr { applyBattleStat(pokemon: Pokemon, passive: boolean, battleStat: BattleStat, statValue: Utils.NumberHolder, args: any[]): boolean | Promise { const move = (args[0] as Move); - if (battleStat === this.battleStat && (!this.condition || this.condition(pokemon, null, move))){ + if (battleStat === this.battleStat && (!this.condition || this.condition(pokemon, null, move))) { statValue.value *= this.multiplier; return true; } @@ -1405,6 +1405,7 @@ export class TraceAbAttr extends PostSummonAbAttr { const targets = pokemon.getOpponents(); if (!targets.length) return false; + let target: Pokemon; if (targets.length > 1) pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex); @@ -1430,18 +1431,14 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr { applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean { const targets = pokemon.getOpponents(); - let target: Pokemon; - - if(targets.length < 1){ + if (!targets.length) return false; - } - if (targets.length > 1){ - pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex); - } - else{ - target = targets[0]; - } + let target: Pokemon; + if (targets.length > 1) + pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex); + else + target = targets[0]; pokemon.summonData.speciesForm = target.getSpeciesForm(); pokemon.summonData.fusionSpeciesForm = target.getFusionSpeciesForm(); diff --git a/src/data/move.ts b/src/data/move.ts index 42bffbf6bd2..a95ce9c91f4 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3099,8 +3099,8 @@ export class RandomMovesetMoveAttr extends OverrideMoveEffectAttr { const moveTargets = getMoveTargets(user, move.moveId); if (!moveTargets.targets.length) return false; - let selectTargets; - switch(true){ + let selectTargets: BattlerIndex[]; + switch (true) { case (moveTargets.multiple || moveTargets.targets.length === 1): { selectTargets = moveTargets.targets; break; @@ -3110,7 +3110,7 @@ export class RandomMovesetMoveAttr extends OverrideMoveEffectAttr { break; } default: { - moveTargets.targets.splice(moveTargets.targets.indexOf(user.getAlly().getBattlerIndex())) + moveTargets.targets.splice(moveTargets.targets.indexOf(user.getAlly().getBattlerIndex())); selectTargets = [ moveTargets.targets[user.randSeedInt(moveTargets.targets.length)] ]; break; }