mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-24 17:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish PostAttack

Browse Source
This commit is contained in:
Dean 2025-02-01 20:37:02 -08:00
parent d85c1ce5db
commit 069490981e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/data/ability.ts
View File

@ -1629,7 +1629,8 @@ export class GorillaTacticsAbAttr extends PostAttackAbAttr {
} }
willSucceedPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean { willSucceedPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
return simulated || !pokemon.getTag(BattlerTagType.GORILLA_TACTICS); return super.willSucceedPostAttack(pokemon, passive, simulated, defender, move, hitResult, args)
&& simulated || !pokemon.getTag(BattlerTagType.GORILLA_TACTICS);
} }
/** /**
@ -2829,6 +2830,11 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
this.effects = effects; this.effects = effects;
} }
willSucceedPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean {
return super.willSucceedPostAttack(pokemon, passive, simulated, defender, move, hitResult, args)
&& this.effects.indexOf(args[0]) > -1 && !defender.isFainted() && defender.canAddTag(BattlerTagType.CONFUSED);
}
/** /**
* Applies confusion to the target pokemon. * Applies confusion to the target pokemon.
@ -2840,15 +2846,11 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
* @param args [0] {@linkcode StatusEffect} applied by move * @param args [0] {@linkcode StatusEffect} applied by move
* @returns true if defender is confused * @returns true if defender is confused
*/ */
applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { applyPostAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
if (this.effects.indexOf(args[0]) > -1 && !defender.isFainted()) { if (simulated) {
if (simulated) { return true;
return defender.canAddTag(BattlerTagType.CONFUSED);
} else {
return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id);
}
} }
return false; return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id);
} }
} }