random-mirrors
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Created new Modifier class MoveEffectModifier" 

This reverts commit 0e57ed03ff.
This commit is contained in:
frutescens 2024-11-17 16:24:30 -08:00
parent 01048c3083
commit ddd0c769f2
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/modifier/modifier.ts
View File

@ -756,32 +756,6 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier {
abstract getMaxHeldItemCount(pokemon?: Pokemon): number;
}
export class MoveEffectModifier extends PokemonHeldItemModifier {
constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
super(type, pokemonId, stackCount);
}
matchType(modifier: Modifier): boolean {
return this.matchType(modifier);
}
shouldApply(pokemon?: Pokemon, ..._args: unknown[]): boolean {
return pokemon?.hasAbility(Abilities.SHEER_FORCE, true) ?? false;
}
apply(pokemon: Pokemon): boolean {
return this.apply(pokemon);
}
getMaxHeldItemCount(pokemon?: Pokemon): number {
return this.getMaxHeldItemCount(pokemon);
}
clone() {
return this.clone();
}
}
export abstract class LapsingPokemonHeldItemModifier extends PokemonHeldItemModifier {
protected battlesLeft: number;
public isTransferable: boolean = false;
@ -1776,7 +1750,7 @@ export class TurnStatusEffectModifier extends PokemonHeldItemModifier {
}
}
export class HitHealModifier extends MoveEffectModifier {
export class HitHealModifier extends PokemonHeldItemModifier {
constructor(type: ModifierType, pokemonId: number, stackCount?: number) {
super(type, pokemonId, stackCount);
}
@ -1795,7 +1769,7 @@ export class HitHealModifier extends MoveEffectModifier {
* @returns `true` if the {@linkcode Pokemon} was healed
*/
override apply(pokemon: Pokemon): boolean {
if (pokemon.turnData.totalDamageDealt && !pokemon.isFullHp()) {
if (pokemon.turnData.totalDamageDealt && !pokemon.isFullHp() && !pokemon.hasAbility(Abilities.SHEER_FORCE, true)) {
const scene = pokemon.scene;
scene.unshiftPhase(new PokemonHealPhase(scene, pokemon.getBattlerIndex(),
toDmgValue(pokemon.turnData.totalDamageDealt / 8) * this.stackCount, i18next.t("modifier:hitHealApply", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: this.type.name }), true));