random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-02-16 17:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Applied new modifier class."

Browse Source 
This reverts commit 222bc8d42875485742ba8bd38fa5e9b978bbd53a.
This commit is contained in:
frutescens 2024-11-17 16:24:04 -08:00
parent bc41e3e7c0
commit 01048c3083
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modifier/modifier.ts
View File

@ -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;
}