diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 3ca57cac56b..bd85ef0c608 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -766,11 +766,11 @@ export class MoveEffectModifier extends PokemonHeldItemModifier { } shouldApply(pokemon?: Pokemon, ..._args: unknown[]): boolean { - return !pokemon?.hasAbility(Abilities.SHEER_FORCE, true); + return pokemon?.hasAbility(Abilities.SHEER_FORCE, true) ?? false; } - apply(pokemon: Pokemon, ...args: unknown[]): boolean { - return this.apply(pokemon, args); + apply(pokemon: Pokemon): boolean { + return this.apply(pokemon); } getMaxHeldItemCount(pokemon?: Pokemon): number { @@ -1789,10 +1789,6 @@ export class HitHealModifier extends MoveEffectModifier { return new HitHealModifier(this.type, this.pokemonId, this.stackCount); } - override shouldApply(pokemon?: Pokemon, ...args: unknown[]): boolean { - return super.shouldApply(pokemon, ...args); - } - /** * Applies {@linkcode HitHealModifier} * @param pokemon The {@linkcode Pokemon} that holds the item @@ -2889,10 +2885,7 @@ export class MoneyMultiplierModifier extends PersistentModifier { } } -/** - * Modifier class for items like Golden Punch - */ -export class DamageMoneyRewardModifier extends MoveEffectModifier { +export class DamageMoneyRewardModifier extends PokemonHeldItemModifier { constructor(type: ModifierType, pokemonId: number, stackCount?: number) { super(type, pokemonId, stackCount); } @@ -3328,10 +3321,6 @@ export class ContactHeldItemTransferChanceModifier extends HeldItemTransferModif return super.getArgs().concat(this.chance * 100); } - shouldApply(pokemon?: Pokemon, ..._args: unknown[]): boolean { - return !pokemon?.hasAbility(Abilities.SHEER_FORCE, true); - } - getTransferredItemCount(): number { return Phaser.Math.RND.realInRange(0, 1) < (this.chance * this.getStackCount()) ? 1 : 0; }