mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-01 13:12:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix thingy kinda ig

Browse Source
This commit is contained in:
Bertie690 2024-11-07 23:02:32 -05:00
parent 4ae510f08d
commit f5129af98d
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/data/move.ts
View File

@ -6589,29 +6589,50 @@ export class RepeatMoveAttr extends OverrideMoveEffectAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const lastMove = target.getLastXMoves().find(() => true); const lastMove = target.getLastXMoves().find(() => true);
const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move); const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move);
if (!movesetMove || movesetMove.virtual) { const moveTargets = lastMove?.targets;
user.scene.queueMessage(i18next.t("battle:attackFailed"));
return false;
}
const moveTargets = getMoveTargets(target, lastMove?.move!);
if (!moveTargets.targets.length) {
user.scene.queueMessage(i18next.t("battle:attackFailed"));
return false;
}
user.scene.queueMessage(i18next.t("moveTriggers:instructingMove", { user.scene.queueMessage(i18next.t("moveTriggers:instructingMove", {
userPokemonName: getPokemonNameWithAffix(user), userPokemonName: getPokemonNameWithAffix(user),
targetPokemonName: getPokemonNameWithAffix(target) targetPokemonName: getPokemonNameWithAffix(target)
})); }));
target.getMoveQueue().push({ move: lastMove?.move!, targets: moveTargets.targets, ignorePP: false }); target.getMoveQueue().push({ move: lastMove?.move!, targets: moveTargets!, ignorePP: false });
target.scene.unshiftPhase(new MovePhase(target.scene, target as PlayerPokemon, moveTargets.targets, movesetMove, false, false)); target.scene.unshiftPhase(new MovePhase(target.scene, target as PlayerPokemon, moveTargets!, movesetMove!, false, false));
return true; return true;
} }
getCondition(): MoveConditionFunc { getCondition(): MoveConditionFunc {
return lastMoveCopiableCondition; // TODO: Make list of un-instructable moves return (user, target, move) => {
const lastMove = target.getLastXMoves().find(() => true);
const movesetMove = target.getMoveset().find(m => m?.moveId === lastMove?.move);
const moveTargets = lastMove?.targets!;
const unrepeatablemoves = [
Moves.OUTRAGE,
Moves.RAGING_FURY,
Moves.ROLLOUT,
Moves.PETAL_DANCE,
Moves.THRASH,
Moves.ICE_BALL,
Moves.SHELL_TRAP,
Moves.KINGS_SHIELD,
Moves.BEAK_BLAST,
Moves.SKETCH,
Moves.TRANSFORM,
Moves.MIMIC,
Moves.STRUGGLE,
Moves.FOCUS_PUNCH,
// TODO: Add Z-move blockage once zmoves are implemented
// as well as actually blocking move calling moves
];
if (!movesetMove ||
!moveTargets.length ||
!targetMoveCopiableCondition(user, target, move) ||
unrepeatablemoves.includes(lastMove?.move!)) {
return false;
}
return true;
};
} }
} }