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

Attempts to resolve merge conflicts

Browse Source
This commit is contained in:
Christopher Schmidt 2024-08-26 12:00:47 -04:00
parent 040a8778ee
commit eb1d0714f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/move.ts
View File

@ -5339,7 +5339,7 @@ export class RandomMoveAttr extends OverrideMoveEffectAttr {
export class RandomMovesetMoveAttr extends RandomMoveAttr { export class RandomMovesetMoveAttr extends RandomMoveAttr {
private includeParty: boolean; private includeParty: boolean;
private moveId: number; private moveId: number;
constructor(invalidMoves: Moves[], includeParty?: boolean) { constructor(invalidMoves: Moves[], includeParty: boolean = false) {
super(invalidMoves); super(invalidMoves);
this.includeParty = includeParty; this.includeParty = includeParty;
} }
@ -5366,12 +5366,12 @@ export class RandomMovesetMoveAttr extends RandomMoveAttr {
allies = [user]; allies = [user];
} }
const partyMoveset = allies.map(p => p.moveset).flat(); const partyMoveset = allies.map(p => p.moveset).flat();
const moves = partyMoveset.filter(m => !this.invalidMoves.includes(m.moveId) && !m.getMove().name.endsWith(" (N)")); const moves = partyMoveset.filter(m => !this.invalidMoves.includes(m!.moveId) && !m!.getMove().name.endsWith(" (N)"));
if (moves.length === 0) { if (moves.length === 0) {
return false; return false;
} }
this.moveId = moves[user.randSeedInt(moves.length)].moveId; this.moveId = moves[user.randSeedInt(moves.length)]!.moveId;
return true; return true;
}; };
} }