ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clearer implementation of combining user and teammates' moves

This commit is contained in:
Christopher Schmidt 2024-07-19 18:05:12 -04:00
parent bd60de6624
commit ad26883309
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/data/move.ts
View File

@ -5000,9 +5000,10 @@ export class RandomMovesetMoveAttr extends OverrideMoveEffectAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveset = (!this.enemyMoveset ? user : target).getMoveset();
const allies = moveset.concat(user.scene.getParty().map(p => p.moveset).flat());
const allies = user.scene.getParty().filter(p => p !== user);
const partyMoveset = moveset.concat(allies.map(p => p.moveset).flat());
const moves = allies.filter(m => !m.getMove().hasFlag(MoveFlags.IGNORE_VIRTUAL));
const moves = partyMoveset.filter(m => !m.getMove().hasFlag(MoveFlags.IGNORE_VIRTUAL));
if (moves.length) {
const move = moves[user.randSeedInt(moves.length)];
const moveIndex = moveset.findIndex(m => m.moveId === move.moveId);