mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-06-30 21:42:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite move/ability effects

Browse Source
This commit is contained in:
Dean 2025-03-18 12:33:46 -07:00
parent 2b24d5cd09
commit bcdeb8a36a
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/data/ability.ts
View File

@ -776,9 +776,9 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr {
/** /**
* Class for abilities that make drain moves deal damage to user instead of healing them. * Class for abilities that make drain moves deal damage to user instead of healing them.
* @extends PostDefendAbAttr * @extends PostDefendAbAttr
* @see {@linkcode applyPreDefend} * @see {@linkcode applyPostDefend}
*/ */
export class ReverseDrainAbAttr extends PreDefendAbAttr { export class ReverseDrainAbAttr extends PostDefendAbAttr {
private attacker: Pokemon; private attacker: Pokemon;
/** /**
@ -787,13 +787,19 @@ export class ReverseDrainAbAttr extends PreDefendAbAttr {
* *
* If so, this ability should cause the move user should be damaged instead of healed * If so, this ability should cause the move user should be damaged instead of healed
*/ */
override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { override canApplyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
this.attacker = attacker; this.attacker = attacker;
return move.hasAttr(HitHealAttr) && !move.hitsSubstitute(attacker, pokemon); return move.hasAttr(HitHealAttr) && !move.hitsSubstitute(attacker, pokemon);
} }
override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): void { override applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): void {
cancelled.value = true; const cancelled = new Utils.BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
const damageAmount = move.getAttrs<HitHealAttr>(HitHealAttr)[0].getHealAmount(attacker, pokemon);
pokemon.turnData.damageTaken += damageAmount;
globalScene.unshiftPhase(new PokemonHealPhase(attacker.getBattlerIndex(), -damageAmount, null, false, true));
}
} }
public override getTriggerMessage(pokemon: Pokemon, _abilityName: string, ..._args: any[]): string | null { public override getTriggerMessage(pokemon: Pokemon, _abilityName: string, ..._args: any[]): string | null {

27
src/data/moves/move.ts
View File

@ -2174,29 +2174,18 @@ export class HitHealAttr extends MoveEffectAttr {
* @returns true if the function succeeds * @returns true if the function succeeds
*/ */
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
let healAmount = 0; if (target.hasAbilityWithAttr(ReverseDrainAbAttr)) {
return false;
}
const healAmount = this.getHealAmount(user, target);
let message = ""; let message = "";
const reverseDrain = new Utils.BooleanHolder(false);
applyPreDefendAbAttrs(ReverseDrainAbAttr, target, user, move, reverseDrain);
if (this.healStat !== null) { if (this.healStat !== null) {
// Strength Sap formula
healAmount = target.getEffectiveStat(this.healStat);
message = i18next.t("battle:drainMessage", { pokemonName: getPokemonNameWithAffix(target) }); message = i18next.t("battle:drainMessage", { pokemonName: getPokemonNameWithAffix(target) });
} else { } else {
// Default healing formula used by draining moves like Absorb, Draining Kiss, Bitter Blade, etc.
healAmount = Utils.toDmgValue(user.turnData.singleHitDamageDealt * this.healRatio);
message = i18next.t("battle:regainHealth", { pokemonName: getPokemonNameWithAffix(user) }); message = i18next.t("battle:regainHealth", { pokemonName: getPokemonNameWithAffix(user) });
} }
if (reverseDrain.value) {
if (user.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
healAmount = 0;
message = "";
} else {
user.turnData.damageTaken += healAmount;
healAmount = healAmount * -1;
message = "";
}
}
globalScene.unshiftPhase(new PokemonHealPhase(user.getBattlerIndex(), healAmount, message, false, true)); globalScene.unshiftPhase(new PokemonHealPhase(user.getBattlerIndex(), healAmount, message, false, true));
return true; return true;
} }
@ -2215,6 +2204,10 @@ export class HitHealAttr extends MoveEffectAttr {
} }
return Math.floor(Math.max((1 - user.getHpRatio()) - 0.33, 0) * (move.power / 4)); return Math.floor(Math.max((1 - user.getHpRatio()) - 0.33, 0) * (move.power / 4));
} }
public getHealAmount(user: Pokemon, target: Pokemon): number {
return (this.healStat) ? target.getEffectiveStat(this.healStat) : Utils.toDmgValue(user.turnData.singleHitDamageDealt * this.healRatio);
}
} }
/** /**