diff --git a/src/data/move.ts b/src/data/move.ts index 1e57aba1df1..9b02bc8e106 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2727,7 +2727,7 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr { if (allyMovePhase) { const allyMove = allyMovePhase.move.getMove(); if (allyMove !== move && allyMove.hasAttr(AwaitCombinedPledgeAttr)) { - [user, allyMovePhase.pokemon].forEach((p) => p.turnData.combiningPledge = move.id); + [ user, allyMovePhase.pokemon ].forEach((p) => p.turnData.combiningPledge = move.id); // "{userPokemonName} is waiting for {allyPokemonName}'s move..." user.scene.queueMessage(i18next.t("moveTriggers:awaitingPledge", { @@ -3838,7 +3838,7 @@ export class CombinedPledgePowerAttr extends VariablePowerAttr { const combinedPledgeMove = user.turnData.combiningPledge; if (combinedPledgeMove && combinedPledgeMove !== move.id) { - power.value *= 150/80; + power.value *= 150 / 80; return true; } return false; diff --git a/src/test/moves/pledge_moves.test.ts b/src/test/moves/pledge_moves.test.ts index d6fde16bf86..67c5cd3b2ee 100644 --- a/src/test/moves/pledge_moves.test.ts +++ b/src/test/moves/pledge_moves.test.ts @@ -31,7 +31,7 @@ describe("Moves - Pledge Moves", () => { game.override .battleType("double") .startingLevel(100) - .moveset([Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE, Moves.SPLASH]) + .moveset([ Moves.FIRE_PLEDGE, Moves.GRASS_PLEDGE, Moves.WATER_PLEDGE, Moves.SPLASH ]) .enemySpecies(Species.SNORLAX) .enemyLevel(100) .enemyAbility(Abilities.BALL_FETCH) @@ -41,7 +41,7 @@ describe("Moves - Pledge Moves", () => { it( "Fire Pledge - should be an 80-power Fire-type attack outside of combination", async () => { - await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); const firePledge = allMoves[Moves.FIRE_PLEDGE]; vi.spyOn(firePledge, "calculateBattlePower"); @@ -52,7 +52,7 @@ describe("Moves - Pledge Moves", () => { game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2 ]); await game.phaseInterceptor.to("MoveEndPhase", false); expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); @@ -63,7 +63,7 @@ describe("Moves - Pledge Moves", () => { it( "Fire Pledge - should not combine with an ally using Fire Pledge", async () => { - await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]); const firePledge = allMoves[Moves.FIRE_PLEDGE]; vi.spyOn(firePledge, "calculateBattlePower");