IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix struggle damage blockable by Magic Guard

pull/214/head
Flashfyre 2024-04-20 19:43:48 -04:00
parent fc06c4d9e1
commit 8faa77cfbf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/data/move.ts
View File

@ -665,12 +665,14 @@ export class SurviveDamageAttr extends ModifiedDamageAttr {
export class RecoilAttr extends MoveEffectAttr { export class RecoilAttr extends MoveEffectAttr {
private useHp: boolean; private useHp: boolean;
private damageRatio: number; private damageRatio: number;
private unblockable: boolean;
constructor(useHp?: boolean, damageRatio?: number) { constructor(useHp: boolean = false, damageRatio: number = 0.25, unblockable: boolean = false) {
super(true); super(true);
this.useHp = useHp; this.useHp = useHp;
this.damageRatio = (damageRatio !== undefined ? damageRatio : 0.25) || 0.25; this.damageRatio = damageRatio;
this.unblockable = unblockable;
} }
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@ -678,7 +680,8 @@ export class RecoilAttr extends MoveEffectAttr {
return false; return false;
const cancelled = new Utils.BooleanHolder(false); const cancelled = new Utils.BooleanHolder(false);
applyAbAttrs(BlockRecoilDamageAttr, user, cancelled); if (!this.unblockable)
applyAbAttrs(BlockRecoilDamageAttr, user, cancelled);
if (cancelled.value) if (cancelled.value)
return false; return false;
@ -4073,7 +4076,7 @@ export function initMoves() {
.attr(RecoilAttr) .attr(RecoilAttr)
.unimplemented(), .unimplemented(),
new AttackMove(Moves.STRUGGLE, Type.NORMAL, MoveCategory.PHYSICAL, 50, -1, 1, -1, 0, 1) new AttackMove(Moves.STRUGGLE, Type.NORMAL, MoveCategory.PHYSICAL, 50, -1, 1, -1, 0, 1)
.attr(RecoilAttr, true) .attr(RecoilAttr, true, 0.25, true)
.attr(TypelessAttr) .attr(TypelessAttr)
.ignoresVirtual() .ignoresVirtual()
.target(MoveTarget.RANDOM_NEAR_ENEMY), .target(MoveTarget.RANDOM_NEAR_ENEMY),