mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-13 11:52:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

add invert check to ProtectStatAbAttr.apply...

Browse Source 
This makes sure that a stat is only protected if no other ability inverts the change. E.g. `Contrary` inverts any decrease to an increase
This commit is contained in:
flx-sta 2024-09-04 16:06:17 -07:00
parent bee925002d
commit 5652eaa92c
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/data/ability.ts
View File

@ -2593,7 +2593,11 @@ export class PreStatStageChangeAbAttr extends AbAttr {
} }
} }
/**
* Protect one or all {@linkcode BattleStat} from reductions caused by other Pokémon's moves and Abilities
*/
export class ProtectStatAbAttr extends PreStatStageChangeAbAttr { export class ProtectStatAbAttr extends PreStatStageChangeAbAttr {
/** {@linkcode BattleStat} to protect or `undefined` if **all** {@linkcode BattleStat} are protected */
private protectedStat?: BattleStat; private protectedStat?: BattleStat;
constructor(protectedStat?: BattleStat) { constructor(protectedStat?: BattleStat) {
@ -2602,8 +2606,18 @@ export class ProtectStatAbAttr extends PreStatStageChangeAbAttr {
this.protectedStat = protectedStat; this.protectedStat = protectedStat;
} }
applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, _args: any[]): boolean { /**
if (Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) { * Apply the {@linkcode ProtectedStatAbAttr} to an interaction
* @param pokemon The {@linkcode Pokemon} with the ability
* @param _passive
* @param simulated
* @param stat the {@linkcode BattleStat} being affected
* @param cancelled The {@linkcode Utils.BooleanHolder} that will be set to true if the stat is protected
* @param _args
* @returns true if the stat is protected, false otherwise
*/
applyPreStatStageChange(pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, _args: any[]): boolean {
if (!this.isStatIncrease(pokemon) && (Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat)) {
cancelled.value = true; cancelled.value = true;
return true; return true;
} }
@ -2618,6 +2632,15 @@ export class ProtectStatAbAttr extends PreStatStageChangeAbAttr {
statName: this.protectedStat ? i18next.t(getStatKey(this.protectedStat)) : i18next.t("battle:stats") statName: this.protectedStat ? i18next.t(getStatKey(this.protectedStat)) : i18next.t("battle:stats")
}); });
} }
/**
* Check if the stat is an increase due to an {@linkcode StatStageChangeMultiplierAbAttr} inverting the multiplier
* @param pokemon The {@linkcode Pokemon} with the ability
* @returns true if the stat is an increase due to an {@linkcode StatStageChangeMultiplierAbAttr} inverting the multiplier
*/
private isStatIncrease(pokemon: Pokemon): boolean {
return pokemon.getAbilityAttrs(StatStageChangeMultiplierAbAttr).some(attr => attr.isInvert());
}
} }
/** /**
@ -3730,6 +3753,14 @@ export class StatStageChangeMultiplierAbAttr extends AbAttr {
return true; return true;
} }
/**
* Check if the multiplier is negative/inverts the change
* @returns true if the multiplier is negative
*/
isInvert(): boolean {
return this.multiplier < 0;
}
} }
export class StatStageChangeCopyAbAttr extends AbAttr { export class StatStageChangeCopyAbAttr extends AbAttr {