From bd44d1ab4c6e6055799a0a484427ba87a0a4851a Mon Sep 17 00:00:00 2001 From: Dread134 Date: Mon, 13 May 2024 10:08:19 -0400 Subject: [PATCH] Shortened Code Shortened code to better match Flower Veil implementation --- src/data/ability.ts | 46 ++------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 2bff81304..6e9b13512 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1675,28 +1675,7 @@ export class StatusEffectImmunityAbAttr extends PreSetStatusAbAttr { } } -export class AllyStatusEffectImmunityAbAttr extends PreSetStatusAbAttr { - private immuneEffects: StatusEffect[]; - - constructor(...immuneEffects: StatusEffect[]) { - super(); - - this.immuneEffects = immuneEffects; - } - - applyPreSetStatus(pokemon: Pokemon, passive: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (!this.immuneEffects.length || this.immuneEffects.indexOf(effect) > -1) { - cancelled.value = true; - return true; - } - - return false; - } - - getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { - return getPokemonMessage(pokemon, `'s ${abilityName}\nprevents ${this.immuneEffects.length ? getStatusEffectDescriptor(args[0] as StatusEffect) : 'status problems'}!`); - } -} +export class AllyStatusEffectImmunityAbAttr extends StatusEffectImmunityAbAttr { } export class PreApplyBattlerTagAbAttr extends AbAttr { applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise { @@ -1727,28 +1706,7 @@ export class BattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr { } } -export class AllyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr { - private immuneTagType: BattlerTagType; - - constructor(immuneTagType: BattlerTagType) { - super(); - - this.immuneTagType = immuneTagType; - } - - applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (tag.tagType === this.immuneTagType) { - cancelled.value = true; - return true; - } - - return false; - } - - getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { - return getPokemonMessage(pokemon, `'s ${abilityName}\nprevents ${(args[0] as BattlerTag).getDescriptor()}!`); - } -} +export class AllyBattlerTagImmunityAbAttr extends BattlerTagImmunityAbAttr { } export class BlockCritAbAttr extends AbAttr { apply(pokemon: Pokemon, passive: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {