From ef48ee61de3f9898cbea63a1a0b143e7f5e59ce5 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Sat, 29 Mar 2025 01:23:24 -0700 Subject: [PATCH] Apply Biome to files --- src/data/splash-messages.ts | 15 ++++------ src/phases/message-phase.ts | 2 +- src/system/settings/settings.ts | 2 +- src/ui/message-ui-handler.ts | 2 +- src/ui/pokedex-page-ui-handler.ts | 17 +++++------ src/ui/ui.ts | 2 +- test/abilities/desolate-land.test.ts | 6 ++-- test/abilities/flower_gift.test.ts | 39 ++++++++++++++++--------- test/abilities/neutralizing_gas.test.ts | 6 ++-- test/abilities/victory_star.test.ts | 6 ++-- test/data/splash_messages.test.ts | 2 +- test/items/reviver_seed.test.ts | 26 +++++++---------- test/moves/endure.test.ts | 6 ++-- test/moves/revival_blessing.test.ts | 8 ++--- 14 files changed, 66 insertions(+), 73 deletions(-) diff --git a/src/data/splash-messages.ts b/src/data/splash-messages.ts index de14e913664..3223bbb019e 100644 --- a/src/data/splash-messages.ts +++ b/src/data/splash-messages.ts @@ -214,7 +214,7 @@ const commonSplashMessages = [ "bornToBeAWinner", "onARollout", "itsAlwaysNightDeepInTheAbyss", - "folksThisIsInsane" + "folksThisIsInsane", ]; //#region Seasonal Messages @@ -224,10 +224,7 @@ const seasonalSplashMessages: Season[] = [ name: "New Year's", start: "01-01", end: "01-15", - messages: [ - "newYears.happyNewYear", - "newYears.andAHappyNewYear" - ], + messages: ["newYears.happyNewYear", "newYears.andAHappyNewYear"], }, { name: "Valentines", @@ -239,7 +236,7 @@ const seasonalSplashMessages: Season[] = [ "valentines.applinForYou", "valentines.thePowerOfLoveIsThreeThirtyBST", "valentines.haveAHeartScale", - "valentines.i<3You" + "valentines.i<3You", ], }, { @@ -279,7 +276,7 @@ const seasonalSplashMessages: Season[] = [ "aprilFools.nowWithQuickTimeEncounters", "aprilFools.timeYourInputsForHigherCatchrate", "aprilFools.certifiedButtonSimulator", - "aprilFools.iHopeYouGetSuckerPunched" + "aprilFools.iHopeYouGetSuckerPunched", ], }, { @@ -293,7 +290,7 @@ const seasonalSplashMessages: Season[] = [ "halloween.mayContainSpiders", "halloween.spookyScarySkeledirge", "halloween.gourgeistUsedTrickOrTreat", - "halloween.letsSnuggleForever" + "halloween.letsSnuggleForever", ], }, { @@ -316,7 +313,7 @@ const seasonalSplashMessages: Season[] = [ "winterHoliday.tisTheSeasonToBeSpeSpa", "winterHoliday.deckTheHalls", "winterHoliday.saveScummingGetsYouOnTheNaughtyList", - "winterHoliday.badTrainersGetRolycoly" + "winterHoliday.badTrainersGetRolycoly", ], }, ]; diff --git a/src/phases/message-phase.ts b/src/phases/message-phase.ts index 2a5bcf6b99c..cff7249fcfa 100644 --- a/src/phases/message-phase.ts +++ b/src/phases/message-phase.ts @@ -29,7 +29,7 @@ export class MessagePhase extends Phase { if (this.text.indexOf("$") > -1) { const pokename: string[] = []; - const repname = [ "#POKEMON1", "#POKEMON2" ]; + const repname = ["#POKEMON1", "#POKEMON2"]; for (let p = 0; p < globalScene.getPlayerField().length; p++) { pokename.push(globalScene.getPlayerField()[p].getNameToRender()); this.text = this.text.split(pokename[p]).join(repname[p]); diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index b2b1d3eb298..2db72dfecda 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -950,7 +950,7 @@ export function setSetting(setting: string, value: number): boolean { }, { label: "Català", - handler: () => changeLocaleHandler("ca-ES") + handler: () => changeLocaleHandler("ca-ES"), }, { label: i18next.t("settings:back"), diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts index 230b951de59..e927793e0ab 100644 --- a/src/ui/message-ui-handler.ts +++ b/src/ui/message-ui-handler.ts @@ -77,7 +77,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { const actionPattern = /@(c|d|s|f)\{(.*?)\}/; let actionMatch: RegExpExecArray | null; const pokename: string[] = []; - const repname = [ "#POKEMON1", "#POKEMON2" ]; + const repname = ["#POKEMON1", "#POKEMON2"]; for (let p = 0; p < globalScene.getPlayerField().length; p++) { pokename.push(globalScene.getPlayerField()[p].getNameToRender()); text = text.split(pokename[p]).join(repname[p]); diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index b359c188e0c..24812f62044 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -1150,15 +1150,14 @@ export default class PokedexPageUiHandler extends MessageUiHandler { }); this.blockInput = false; } else { - ui.revertMode() - .then(() => { - console.log("exitCallback", this.exitCallback); - if (this.exitCallback instanceof Function) { - const exitCallback = this.exitCallback; - this.exitCallback = null; - exitCallback(); - } - }); + ui.revertMode().then(() => { + console.log("exitCallback", this.exitCallback); + if (this.exitCallback instanceof Function) { + const exitCallback = this.exitCallback; + this.exitCallback = null; + exitCallback(); + } + }); success = true; } } else { diff --git a/src/ui/ui.ts b/src/ui/ui.ts index 026e42ccf46..6605e5ef730 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -329,7 +329,7 @@ export default class UI extends Phaser.GameObjects.Container { promptDelay?: number | null, ): void { const pokename: string[] = []; - const repname = [ "#POKEMON1", "#POKEMON2" ]; + const repname = ["#POKEMON1", "#POKEMON2"]; for (let p = 0; p < globalScene.getPlayerField().length; p++) { pokename.push(globalScene.getPlayerField()[p].getNameToRender()); text = text.split(pokename[p]).join(repname[p]); diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts index 405aab873aa..bb0b152418d 100644 --- a/test/abilities/desolate-land.test.ts +++ b/test/abilities/desolate-land.test.ts @@ -135,10 +135,8 @@ describe("Abilities - Desolate Land", () => { }); it("should lift after fleeing from a wild pokemon", async () => { - game.override - .enemyAbility(Abilities.DESOLATE_LAND) - .ability(Abilities.BALL_FETCH); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + game.override.enemyAbility(Abilities.DESOLATE_LAND).ability(Abilities.BALL_FETCH); + await game.classicMode.startBattle([Species.MAGIKARP]); expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.HARSH_SUN); vi.spyOn(game.scene.getPlayerPokemon()!, "randSeedInt").mockReturnValue(0); diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts index 1104a3c111f..5c3fd246b7a 100644 --- a/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -40,17 +40,23 @@ describe("Abilities - Flower Gift", () => { * * @returns Two numbers, the first being the damage done to the target without flower gift active, the second being the damage done with flower gift active */ - const testDamageDealt = async (game: GameManager, move: Moves, allyAttacker: boolean, allyAbility = Abilities.BALL_FETCH, enemyAbility = Abilities.BALL_FETCH): Promise<[number, number]> => { + const testDamageDealt = async ( + game: GameManager, + move: Moves, + allyAttacker: boolean, + allyAbility = Abilities.BALL_FETCH, + enemyAbility = Abilities.BALL_FETCH, + ): Promise<[number, number]> => { game.override.battleType("double"); - game.override.moveset([ Moves.SPLASH, Moves.SUNNY_DAY, move, Moves.HEAL_PULSE ]); - game.override.enemyMoveset([ Moves.SPLASH, Moves.HEAL_PULSE ]); + game.override.moveset([Moves.SPLASH, Moves.SUNNY_DAY, move, Moves.HEAL_PULSE]); + game.override.enemyMoveset([Moves.SPLASH, Moves.HEAL_PULSE]); const target_index = allyAttacker ? BattlerIndex.ENEMY : BattlerIndex.PLAYER_2; const attacker_index = allyAttacker ? BattlerIndex.PLAYER_2 : BattlerIndex.ENEMY; const ally_move = allyAttacker ? move : Moves.SPLASH; const enemy_move = allyAttacker ? Moves.SPLASH : move; const ally_target = allyAttacker ? BattlerIndex.ENEMY : null; - await game.classicMode.startBattle([ Species.CHERRIM, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]); const target = allyAttacker ? game.scene.getEnemyField()[0] : game.scene.getPlayerField()[1]; const initialHp = target.getMaxHp(); @@ -64,7 +70,7 @@ describe("Abilities - Flower Gift", () => { await game.forceEnemyMove(enemy_move, BattlerIndex.PLAYER_2); await game.forceEnemyMove(Moves.SPLASH); // Ensure sunny day is used last. - await game.setTurnOrder([ attacker_index, target_index, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER ]); + await game.setTurnOrder([attacker_index, target_index, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]); await game.phaseInterceptor.to(TurnEndPhase); const damageWithoutGift = initialHp - target.hp; @@ -75,14 +81,13 @@ describe("Abilities - Flower Gift", () => { game.move.select(ally_move, 1, ally_target); await game.forceEnemyMove(enemy_move, BattlerIndex.PLAYER_2); await game.forceEnemyMove(Moves.SPLASH); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, target_index, attacker_index ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, target_index, attacker_index]); await game.phaseInterceptor.to(TurnEndPhase); const damageWithGift = initialHp - target.hp; - return [ damageWithoutGift, damageWithGift ]; + return [damageWithoutGift, damageWithGift]; }; - beforeAll(() => { phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, @@ -129,22 +134,28 @@ describe("Abilities - Flower Gift", () => { }); it("should not increase the damage of an ally using an ability ignoring move", async () => { - const [ damageWithGift, damageWithoutGift ] = await testDamageDealt(game, Moves.SUNSTEEL_STRIKE, true); + const [damageWithGift, damageWithoutGift] = await testDamageDealt(game, Moves.SUNSTEEL_STRIKE, true); expect(damageWithGift).toBe(damageWithoutGift); }); it("should not increase the damage of a mold breaker ally", async () => { - const [ damageWithGift, damageWithoutGift ] = await testDamageDealt(game, Moves.TACKLE, true, Abilities.MOLD_BREAKER); + const [damageWithGift, damageWithoutGift] = await testDamageDealt(game, Moves.TACKLE, true, Abilities.MOLD_BREAKER); expect(damageWithGift).toBe(damageWithoutGift); }); it("should decrease the damage an ally takes from a special attack", async () => { - const [ damageWithoutGift, damageWithGift ] = await testDamageDealt(game, Moves.MUD_SLAP, false); + const [damageWithoutGift, damageWithGift] = await testDamageDealt(game, Moves.MUD_SLAP, false); expect(damageWithGift).toBeLessThan(damageWithoutGift); }); - it("should not decrease the damage an ally takes from a mold breaker enemy using a special attack", async () => { - const [ damageWithoutGift, damageWithGift ] = await testDamageDealt(game, Moves.MUD_SLAP, false, Abilities.BALL_FETCH, Abilities.MOLD_BREAKER); + it("should not decrease the damage an ally takes from a mold breaker enemy using a special attack", async () => { + const [damageWithoutGift, damageWithGift] = await testDamageDealt( + game, + Moves.MUD_SLAP, + false, + Abilities.BALL_FETCH, + Abilities.MOLD_BREAKER, + ); expect(damageWithGift).toBe(damageWithoutGift); }); @@ -168,7 +179,7 @@ describe("Abilities - Flower Gift", () => { it("reverts to Overcast Form when the Pokémon loses Flower Gift, changes form under Harsh Sunlight/Sunny when it regains it", async () => { game.override.enemyMoveset([Moves.SKILL_SWAP]).weather(WeatherType.HARSH_SUN); - game.override.moveset([ Moves.SKILL_SWAP ]); + game.override.moveset([Moves.SKILL_SWAP]); await game.classicMode.startBattle([Species.CHERRIM]); diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts index aa5a48d5e4e..a10a246d855 100644 --- a/test/abilities/neutralizing_gas.test.ts +++ b/test/abilities/neutralizing_gas.test.ts @@ -160,10 +160,8 @@ describe("Abilities - Neutralizing Gas", () => { }); it("should deactivate after fleeing from a wild pokemon", async () => { - game.override - .enemyAbility(Abilities.NEUTRALIZING_GAS) - .ability(Abilities.BALL_FETCH); - await game.classicMode.startBattle([ Species.MAGIKARP ]); + game.override.enemyAbility(Abilities.NEUTRALIZING_GAS).ability(Abilities.BALL_FETCH); + await game.classicMode.startBattle([Species.MAGIKARP]); expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); vi.spyOn(game.scene.getPlayerPokemon()!, "randSeedInt").mockReturnValue(0); diff --git a/test/abilities/victory_star.test.ts b/test/abilities/victory_star.test.ts index 456f8cd7ddd..92db522871a 100644 --- a/test/abilities/victory_star.test.ts +++ b/test/abilities/victory_star.test.ts @@ -24,7 +24,7 @@ describe("Abilities - Victory Star", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.TACKLE, Moves.SPLASH ]) + .moveset([Moves.TACKLE, Moves.SPLASH]) .battleType("double") .disableCrits() .enemySpecies(Species.MAGIKARP) @@ -33,7 +33,7 @@ describe("Abilities - Victory Star", () => { }); it("should increase the accuracy of its user", async () => { - await game.classicMode.startBattle([ Species.VICTINI, Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.VICTINI, Species.MAGIKARP]); const user = game.scene.getPlayerField()[0]; @@ -46,7 +46,7 @@ describe("Abilities - Victory Star", () => { }); it("should increase the accuracy of its user's ally", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP, Species.VICTINI ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.VICTINI]); const ally = game.scene.getPlayerField()[0]; vi.spyOn(ally, "getAccuracyMultiplier"); diff --git a/test/data/splash_messages.test.ts b/test/data/splash_messages.test.ts index bd29a17339a..773b2715825 100644 --- a/test/data/splash_messages.test.ts +++ b/test/data/splash_messages.test.ts @@ -9,7 +9,7 @@ describe("Data - Splash Messages", () => { // Make sure to adjust this test if the weight is changed! it("should add contain 15 `battlesWon` splash messages", () => { - const battlesWonMessages = getSplashMessages().filter((message) => message === "splashMessages:battlesWon"); + const battlesWonMessages = getSplashMessages().filter(message => message === "splashMessages:battlesWon"); expect(battlesWonMessages).toHaveLength(15); }); diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver_seed.test.ts index ab249d48a23..c06f354a94a 100644 --- a/test/items/reviver_seed.test.ts +++ b/test/items/reviver_seed.test.ts @@ -26,7 +26,7 @@ describe("Items - Reviver Seed", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.SPLASH, Moves.TACKLE, Moves.ENDURE ]) + .moveset([Moves.SPLASH, Moves.TACKLE, Moves.ENDURE]) .ability(Abilities.BALL_FETCH) .battleType("single") .disableCrits() @@ -47,13 +47,10 @@ describe("Items - Reviver Seed", () => { { moveType: "Fixed Damage Move", move: Moves.SEISMIC_TOSS }, { moveType: "Final Gambit", move: Moves.FINAL_GAMBIT }, { moveType: "Counter", move: Moves.COUNTER }, - { moveType: "OHKO", move: Moves.SHEER_COLD } + { moveType: "OHKO", move: Moves.SHEER_COLD }, ])("should activate the holder's reviver seed from a $moveType", async ({ move }) => { - game.override - .enemyLevel(100) - .startingLevel(1) - .enemyMoveset(move); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + game.override.enemyLevel(100).startingLevel(1).enemyMoveset(move); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.damageAndUpdate(player.hp - 1); @@ -67,11 +64,8 @@ describe("Items - Reviver Seed", () => { }); it("should activate the holder's reviver seed from confusion self-hit", async () => { - game.override - .enemyLevel(1) - .startingLevel(100) - .enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + game.override.enemyLevel(1).startingLevel(100).enemyMoveset(Moves.SPLASH); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.damageAndUpdate(player.hp - 1); player.addTag(BattlerTagType.CONFUSED, 3); @@ -100,7 +94,7 @@ describe("Items - Reviver Seed", () => { .enemySpecies(Species.MAGIKARP) .moveset(move) .enemyMoveset(Moves.ENDURE); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; enemy.damageAndUpdate(enemy.hp - 1); @@ -124,7 +118,7 @@ describe("Items - Reviver Seed", () => { .moveset(move) .enemyAbility(Abilities.LIQUID_OOZE) .enemyMoveset(Moves.SPLASH); - await game.classicMode.startBattle([ Species.GASTLY, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.GASTLY, Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.damageAndUpdate(player.hp - 1); @@ -145,13 +139,13 @@ describe("Items - Reviver Seed", () => { .moveset(Moves.DESTINY_BOND) .startingHeldItems([]) // reset held items to nothing so user doesn't revive and not trigger Destiny Bond .enemyMoveset(Moves.TACKLE); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const player = game.scene.getPlayerPokemon()!; player.damageAndUpdate(player.hp - 1); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.DESTINY_BOND); - await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.isFainted()).toBeTruthy(); diff --git a/test/moves/endure.test.ts b/test/moves/endure.test.ts index d706d5d9581..8fbb2272ece 100644 --- a/test/moves/endure.test.ts +++ b/test/moves/endure.test.ts @@ -22,7 +22,7 @@ describe("Moves - Endure", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([ Moves.THUNDER, Moves.BULLET_SEED, Moves.TOXIC, Moves.SHEER_COLD ]) + .moveset([Moves.THUNDER, Moves.BULLET_SEED, Moves.TOXIC, Moves.SHEER_COLD]) .ability(Abilities.SKILL_LINK) .startingLevel(100) .battleType("single") @@ -51,7 +51,7 @@ describe("Moves - Endure", () => { }); it("should let the pokemon survive against OHKO moves", async () => { - await game.classicMode.startBattle([ Species.MAGIKARP ]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.SHEER_COLD); @@ -74,7 +74,7 @@ describe("Moves - Endure", () => { .enemySpecies(Species.MAGIKARP) .moveset(move) .enemyMoveset(Moves.ENDURE); - await game.classicMode.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; enemy.damageAndUpdate(enemy.hp - 1); diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts index 1ceb850edea..87be20f60ad 100644 --- a/test/moves/revival_blessing.test.ts +++ b/test/moves/revival_blessing.test.ts @@ -116,12 +116,8 @@ describe("Moves - Revival Blessing", () => { }); it("should not summon multiple pokemon to the same slot when reviving the enemy ally in doubles", async () => { - game.override - .battleType("double") - .enemyMoveset([ Moves.REVIVAL_BLESSING ]) - .moveset([ Moves.SPLASH ]) - .startingWave(25); // 2nd rival battle - must have 3+ pokemon - await game.classicMode.startBattle([ Species.ARCEUS, Species.GIRATINA ]); + game.override.battleType("double").enemyMoveset([Moves.REVIVAL_BLESSING]).moveset([Moves.SPLASH]).startingWave(25); // 2nd rival battle - must have 3+ pokemon + await game.classicMode.startBattle([Species.ARCEUS, Species.GIRATINA]); const enemyFainting = game.scene.getEnemyField()[0];