mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-11-25 08:16:04 +00:00
[Bug] Fix hustle not applying attack boost (#3101)
This commit is contained in:
parent
e84649854d
commit
799458c946
@ -4356,7 +4356,7 @@ export function initAbilities() {
|
||||
new Ability(Abilities.TRUANT, 3)
|
||||
.attr(PostSummonAddBattlerTagAbAttr, BattlerTagType.TRUANT, 1, false),
|
||||
new Ability(Abilities.HUSTLE, 3)
|
||||
.attr(BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5, (user, target, move) => move.category === MoveCategory.PHYSICAL)
|
||||
.attr(BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5)
|
||||
.attr(BattleStatMultiplierAbAttr, BattleStat.ACC, 0.8, (user, target, move) => move.category === MoveCategory.PHYSICAL),
|
||||
new Ability(Abilities.CUTE_CHARM, 3)
|
||||
.attr(PostDefendContactApplyTagChanceAbAttr, 30, BattlerTagType.INFATUATED),
|
||||
|
99
src/test/abilities/hustle.test.ts
Normal file
99
src/test/abilities/hustle.test.ts
Normal file
@ -0,0 +1,99 @@
|
||||
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import Phaser from "phaser";
|
||||
import GameManager from "#app/test/utils/gameManager";
|
||||
import overrides from "#app/overrides";
|
||||
import { Species } from "#enums/species";
|
||||
import { Moves } from "#enums/moves";
|
||||
import { getMovePosition } from "#app/test/utils/gameManagerUtils";
|
||||
import { DamagePhase, MoveEffectPhase } from "#app/phases.js";
|
||||
import { Abilities } from "#app/enums/abilities.js";
|
||||
import { Stat } from "#app/enums/stat.js";
|
||||
import { allMoves } from "#app/data/move.js";
|
||||
|
||||
describe("Abilities - Hustle", () => {
|
||||
let phaserGame: Phaser.Game;
|
||||
let game: GameManager;
|
||||
|
||||
beforeAll(() => {
|
||||
phaserGame = new Phaser.Game({
|
||||
type: Phaser.HEADLESS,
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
game.phaseInterceptor.restoreOg();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
game = new GameManager(phaserGame);
|
||||
vi.spyOn(overrides, "ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.HUSTLE);
|
||||
vi.spyOn(overrides, "MOVESET_OVERRIDE", "get").mockReturnValue([Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE]);
|
||||
vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(5);
|
||||
vi.spyOn(overrides, "NEVER_CRIT_OVERRIDE", "get").mockReturnValue(true);
|
||||
vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(5);
|
||||
vi.spyOn(overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]);
|
||||
vi.spyOn(overrides, "OPP_SPECIES_OVERRIDE", "get").mockReturnValue(Species.SHUCKLE);
|
||||
vi.spyOn(overrides, "OPP_ABILITY_OVERRIDE", "get").mockReturnValue(Abilities.BALL_FETCH);
|
||||
});
|
||||
|
||||
it("increases the user's Attack stat by 50%", async () => {
|
||||
await game.startBattle([Species.PIKACHU]);
|
||||
const pikachu = game.scene.getPlayerPokemon();
|
||||
const atk = pikachu.stats[Stat.ATK];
|
||||
|
||||
vi.spyOn(pikachu, "getBattleStat");
|
||||
|
||||
game.doAttack(getMovePosition(game.scene, 0, Moves.TACKLE));
|
||||
await game.phaseInterceptor.to(MoveEffectPhase, false);
|
||||
vi.spyOn(game.scene.getCurrentPhase() as MoveEffectPhase, "hitCheck").mockReturnValue(true);
|
||||
await game.phaseInterceptor.to(DamagePhase);
|
||||
|
||||
expect(pikachu.getBattleStat).toHaveReturnedWith(atk * 1.5);
|
||||
});
|
||||
|
||||
it("lowers the accuracy of the user's physical moves by 20%", async () => {
|
||||
await game.startBattle([Species.PIKACHU]);
|
||||
const pikachu = game.scene.getPlayerPokemon();
|
||||
|
||||
vi.spyOn(pikachu, "getAccuracyMultiplier");
|
||||
|
||||
game.doAttack(getMovePosition(game.scene, 0, Moves.TACKLE));
|
||||
await game.phaseInterceptor.to(MoveEffectPhase);
|
||||
|
||||
expect(pikachu.getAccuracyMultiplier).toHaveReturnedWith(0.8);
|
||||
});
|
||||
|
||||
it("does not affect non-physical moves", async () => {
|
||||
await game.startBattle([Species.PIKACHU]);
|
||||
const pikachu = game.scene.getPlayerPokemon();
|
||||
const spatk = pikachu.stats[Stat.SPATK];
|
||||
|
||||
vi.spyOn(pikachu, "getBattleStat");
|
||||
vi.spyOn(pikachu, "getAccuracyMultiplier");
|
||||
|
||||
game.doAttack(getMovePosition(game.scene, 0, Moves.GIGA_DRAIN));
|
||||
await game.phaseInterceptor.to(DamagePhase);
|
||||
|
||||
expect(pikachu.getBattleStat).toHaveReturnedWith(spatk);
|
||||
expect(pikachu.getAccuracyMultiplier).toHaveReturnedWith(1);
|
||||
});
|
||||
|
||||
// Skip until OHKO moves are fixed - it should not be affected by accuracy and evasion stats
|
||||
it("does not affect OHKO moves", async () => {
|
||||
vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(100);
|
||||
vi.spyOn(overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(30);
|
||||
|
||||
await game.startBattle([Species.PIKACHU]);
|
||||
const pikachu = game.scene.getPlayerPokemon();
|
||||
|
||||
vi.spyOn(pikachu, "getAccuracyMultiplier");
|
||||
vi.spyOn(allMoves[Moves.FISSURE], "calculateBattleAccuracy");
|
||||
|
||||
game.doAttack(getMovePosition(game.scene, 0, Moves.FISSURE));
|
||||
await game.phaseInterceptor.to(DamagePhase);
|
||||
|
||||
expect(game.scene.getEnemyPokemon().turnData.damageTaken).toBe(game.scene.getEnemyPokemon().hp);
|
||||
expect(pikachu.getAccuracyMultiplier).toHaveReturnedWith(1);
|
||||
expect(allMoves[Moves.FISSURE].calculateBattleAccuracy).toHaveReturnedWith(100);
|
||||
}, { skip: true });
|
||||
});
|
Loading…
Reference in New Issue
Block a user