mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-02 14:32:18 +02:00
Compare commits
3 Commits
fb11f7377b
...
5a1fbda44a
Author | SHA1 | Date | |
---|---|---|---|
|
5a1fbda44a | ||
|
e3ebeb9471 | ||
|
eab4f6e01f |
@ -3903,12 +3903,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
|
||||
const targets = pokemon.getOpponents();
|
||||
const target = this.getTarget(targets);
|
||||
|
||||
//Prevents Imposter from triggering on a transformed target or if the user is already transformed
|
||||
if (pokemon?.isTransformed() || target?.isTransformed()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (target?.summonData?.illusion) {
|
||||
if (target?.summonData?.illusion || pokemon?.isTransformed() || target?.isTransformed()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -7610,13 +7610,13 @@ export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr {
|
||||
*/
|
||||
export class TransformAttr extends MoveEffectAttr {
|
||||
override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
|
||||
if (!super.apply(user, target, move, args)) {
|
||||
if (!super.apply(user, target, move, args) || (target.isTransformed() || user.isTransformed())) {
|
||||
globalScene.phaseManager.queueMessage(i18next.t("battle:attackFailed"));
|
||||
return false;
|
||||
}
|
||||
|
||||
globalScene.phaseManager.unshiftNew("PokemonTransformPhase", user.getBattlerIndex(), target.getBattlerIndex());
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -339,17 +339,6 @@ export class MovePhase extends BattlePhase {
|
||||
this.showMoveText();
|
||||
}
|
||||
|
||||
if (
|
||||
//Prevent using Transform if either the user or target is already transformed
|
||||
this.move.getMove().id === MoveId.TRANSFORM &&
|
||||
(targets[0].isTransformed() || this.pokemon.isTransformed())
|
||||
) {
|
||||
this.showMoveText();
|
||||
this.showFailedText();
|
||||
this.end();
|
||||
return;
|
||||
}
|
||||
|
||||
// Clear out any two turn moves once they've been used.
|
||||
// TODO: Refactor move queues and remove this assignment;
|
||||
// Move queues should be handled by the calling `CommandPhase` or a manager for it
|
||||
|
Loading…
Reference in New Issue
Block a user