mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-06 08:22:16 +02:00
test
This commit is contained in:
parent
5a2e199181
commit
1dafb99332
@ -3376,8 +3376,12 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
|
|||||||
}
|
}
|
||||||
const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
|
const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
|
||||||
const lastPpUsed = movesetMove.ppUsed;
|
const lastPpUsed = movesetMove.ppUsed;
|
||||||
|
<<<<<<< Updated upstream
|
||||||
<<<<<<< Updated upstream
|
<<<<<<< Updated upstream
|
||||||
if (!lastMove || lastPpUsed < 1) {
|
if (!lastMove || lastPpUsed < 1) {
|
||||||
|
=======
|
||||||
|
if (lastPpUsed < 1) {
|
||||||
|
>>>>>>> Stashed changes
|
||||||
=======
|
=======
|
||||||
if (lastPpUsed < 1) {
|
if (lastPpUsed < 1) {
|
||||||
>>>>>>> Stashed changes
|
>>>>>>> Stashed changes
|
||||||
|
Loading…
Reference in New Issue
Block a user