Add beach and city backgrounds

This commit is contained in:
Flashfyre committed 2023-05-08 10:03:57 -04:00
1 parent 40e69789c8
commit 66cd02fc30
9 files changed
+12 -17

No files matched your search

+8 -9
View File
@@ -682,25 +682,24 @@ export class CommandPhase extends FieldPhase {
}
break;
case Command.POKEMON:
case Command.RUN:
const isSwitch = command === Command.POKEMON;
const trapTag = playerPokemon.findTag(t => t instanceof TrappedTag) as TrappedTag;
const trapped = new Utils.BooleanHolder(false);
const batonPass = args[0] as boolean;
const batonPass = isSwitch && args[0] as boolean;
if (!batonPass)
applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trapped);
if (batonPass || (!trapTag && !trapped.value)) {
this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, cursor, true, args[0] as boolean));
if (isSwitch)
this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, cursor, true, args[0] as boolean));
else
this.scene.unshiftPhase(new AttemptRunPhase(this.scene));
success = true;
} else if (trapTag)
this.scene.ui.showText(`${this.scene.getPokemonById(trapTag.sourceId).name}'s ${trapTag.getMoveName()}\nprevents switching!`, null, () => {
this.scene.ui.showText(`${this.scene.getPokemonById(trapTag.sourceId).name}'s ${trapTag.getMoveName()}\nprevents ${isSwitch ? 'switching' : 'fleeing'}!`, null, () => {
this.scene.ui.showText(null, 0);
}, null, true);
break;
case Command.RUN:
this.scene.unshiftPhase(new AttemptRunPhase(this.scene));
success = true;
//this.scene.unshiftPhase(new MoveAnimTestPhase(this.scene));
//success = true;
break;
}
if (success) {