diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 78b65d6998a..6ff52b0b446 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -1257,7 +1257,7 @@ export class MoveTypeChangeAbAttr extends PreAttackAbAttr { * @returns whether the move type change attribute can be applied */ override canApplyPreAttack(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _defender: Pokemon | null, move: Move, _args: [NumberHolder?, NumberHolder?, ...any]): boolean { - return (this.condition && this.condition(pokemon, _defender, move) && + return ((!this.condition || this.condition(pokemon, _defender, move)) && !noAbilityTypeOverrideMoves.has(move.id) && (!pokemon.isTerastallized || (move.id !== Moves.TERA_BLAST && @@ -7027,7 +7027,7 @@ export function initAbilities() { new Ability(Abilities.TRIAGE, 7) .attr(ChangeMovePriorityAbAttr, (pokemon, move) => move.hasFlag(MoveFlags.TRIAGE_MOVE), 3), new Ability(Abilities.GALVANIZE, 7) - .attr(MoveTypeChangeAbAttr, PokemonType.ELECTRIC, 1.2, (user, target, move) => move.type === PokemonType.NORMAL), + .attr(MoveTypeChangeAbAttr, PokemonType.ELECTRIC, 1.2, (_user, _target, move) => move.type === PokemonType.NORMAL), new Ability(Abilities.SURGE_SURFER, 7) .conditionalAttr(getTerrainCondition(TerrainType.ELECTRIC), StatMultiplierAbAttr, Stat.SPD, 2), new Ability(Abilities.SCHOOLING, 7) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 0cdc7f2738e..12e53c23245 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -814,10 +814,6 @@ export default class Move implements Localizable { // apply move type changing ability attributes applyPreAttackAbAttrs(MoveTypeChangeAbAttr, source, target, this, true, typeChangeHolder, typeChangeMovePowerMultiplier); - if (typeChangeHolder.value !== this.type) { - console.log("=========================================="); - console.log("Move type change to " + PokemonType[typeChangeHolder.value]); - } const sourceTeraType = source.getTeraType(); if (source.isTerastallized && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !globalScene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) { @@ -856,9 +852,7 @@ export default class Move implements Localizable { if (!this.hasAttr(TypelessAttr)) { globalScene.arena.applyTags(WeakenMoveTypeTag, simulated, typeChangeHolder.value, power); - console.log("Before applying attack type boosters, power is " + power.value); globalScene.applyModifiers(AttackTypeBoosterModifier, source.isPlayer(), source, typeChangeHolder.value, power); - console.log("After applying attack type boosters, power is " + power.value); } if (source.getTag(HelpingHandTag)) { diff --git a/test/abilities/galvanize-refrigerate-pixilate.test.ts b/test/abilities/galvanize-refrigerate-pixilate.test.ts index 786f7e1c5da..1f40780f1d5 100644 --- a/test/abilities/galvanize-refrigerate-pixilate.test.ts +++ b/test/abilities/galvanize-refrigerate-pixilate.test.ts @@ -63,22 +63,21 @@ describe.each([ const typeSpy = vi.spyOn(playerPokemon, "getMoveType"); const enemyPokemon = game.scene.getEnemyPokemon()!; - vi.spyOn(enemyPokemon, "apply"); - - const move = allMoves[Moves.TACKLE]; - const powerSpy = vi.spyOn(move, "calculateBattlePower"); + const enemySpy = vi.spyOn(enemyPokemon, "apply"); + const powerSpy = vi.spyOn(allMoves[Moves.TACKLE], "calculateBattlePower"); game.move.select(Moves.TACKLE); await game.phaseInterceptor.to("BerryPhase", false); - expect(playerPokemon.getMoveType).toHaveLastReturnedWith(ty); - expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.EFFECTIVE); - expect(move.calculateBattlePower).toHaveReturnedWith(48); + expect(typeSpy).toHaveLastReturnedWith(ty); + expect(enemySpy).toHaveReturnedWith(HitResult.EFFECTIVE); + expect(powerSpy).toHaveReturnedWith(48); expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); typeSpy.mockRestore(); powerSpy.mockRestore(); + enemySpy.mockRestore(); }); // Galvanize specifically would like to check for volt absorb's activation