mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-24 00:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix linting

Browse Source
This commit is contained in:
NightKev 2024-10-03 23:24:12 -07:00 committed by GitHub
parent 8112a5eea7
commit 467174b669
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/move.ts
View File

@ -2727,7 +2727,7 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
if (allyMovePhase) { if (allyMovePhase) {
const allyMove = allyMovePhase.move.getMove(); const allyMove = allyMovePhase.move.getMove();
if (allyMove !== move && allyMove.hasAttr(AwaitCombinedPledgeAttr)) { 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..." // "{userPokemonName} is waiting for {allyPokemonName}'s move..."
user.scene.queueMessage(i18next.t("moveTriggers:awaitingPledge", { user.scene.queueMessage(i18next.t("moveTriggers:awaitingPledge", {
@ -3838,7 +3838,7 @@ export class CombinedPledgePowerAttr extends VariablePowerAttr {
const combinedPledgeMove = user.turnData.combiningPledge; const combinedPledgeMove = user.turnData.combiningPledge;
if (combinedPledgeMove && combinedPledgeMove !== move.id) { if (combinedPledgeMove && combinedPledgeMove !== move.id) {
power.value *= 150/80; power.value *= 150 / 80;
return true; return true;
} }
return false; return false;

8
src/test/moves/pledge_moves.test.ts
View File

@ -31,7 +31,7 @@ describe("Moves - Pledge Moves", () => {
game.override game.override
.battleType("double") .battleType("double")
.startingLevel(100) .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) .enemySpecies(Species.SNORLAX)
.enemyLevel(100) .enemyLevel(100)
.enemyAbility(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH)
@ -41,7 +41,7 @@ describe("Moves - Pledge Moves", () => {
it( it(
"Fire Pledge - should be an 80-power Fire-type attack outside of combination", "Fire Pledge - should be an 80-power Fire-type attack outside of combination",
async () => { async () => {
await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
const firePledge = allMoves[Moves.FIRE_PLEDGE]; const firePledge = allMoves[Moves.FIRE_PLEDGE];
vi.spyOn(firePledge, "calculateBattlePower"); 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.FIRE_PLEDGE, 0, BattlerIndex.ENEMY);
game.move.select(Moves.SPLASH, 1); 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); await game.phaseInterceptor.to("MoveEndPhase", false);
expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80); expect(firePledge.calculateBattlePower).toHaveLastReturnedWith(80);
@ -63,7 +63,7 @@ describe("Moves - Pledge Moves", () => {
it( it(
"Fire Pledge - should not combine with an ally using Fire Pledge", "Fire Pledge - should not combine with an ally using Fire Pledge",
async () => { async () => {
await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); await game.classicMode.startBattle([ Species.BLASTOISE, Species.CHARIZARD ]);
const firePledge = allMoves[Moves.FIRE_PLEDGE]; const firePledge = allMoves[Moves.FIRE_PLEDGE];
vi.spyOn(firePledge, "calculateBattlePower"); vi.spyOn(firePledge, "calculateBattlePower");