mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-11 10:52:17 +02:00
last line of code for this feature. will revert everything after.
This commit is contained in:
parent
ff562af446
commit
a6d4beb02a
@ -1788,7 +1788,7 @@ export class CommandPhase extends FieldPhase {
|
|||||||
if (!batonPass)
|
if (!batonPass)
|
||||||
enemyField.forEach(enemyPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trapped));
|
enemyField.forEach(enemyPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trapped));
|
||||||
if (batonPass || (!trapTag && !trapped.value)) {
|
if (batonPass || (!trapTag && !trapped.value)) {
|
||||||
this.scene.currentBattle.turnCommands[this.fieldIndex] = isSwitch
|
this.scene.currentBattle.turnCommands[args[1]] = isSwitch
|
||||||
? { command: Command.POKEMON, cursor: cursor, args: args }
|
? { command: Command.POKEMON, cursor: cursor, args: args }
|
||||||
: { command: Command.RUN };
|
: { command: Command.RUN };
|
||||||
success = true;
|
success = true;
|
||||||
@ -1955,11 +1955,15 @@ export class TurnStartPhase extends FieldPhase {
|
|||||||
start() {
|
start() {
|
||||||
super.start();
|
super.start();
|
||||||
|
|
||||||
|
|
||||||
const field = this.scene.getField();
|
const field = this.scene.getField();
|
||||||
const order = this.getOrder();
|
const order = this.getOrder();
|
||||||
|
|
||||||
const moveOrder = order.slice(0);
|
const moveOrder = order.slice(0);
|
||||||
|
|
||||||
|
console.log('field', field);
|
||||||
|
console.log('moveOrder', moveOrder);
|
||||||
|
// if (this.scene.currentBattle.turn === 1 && field.)
|
||||||
|
|
||||||
moveOrder.sort((a, b) => {
|
moveOrder.sort((a, b) => {
|
||||||
const aCommand = this.scene.currentBattle.turnCommands[a];
|
const aCommand = this.scene.currentBattle.turnCommands[a];
|
||||||
const bCommand = this.scene.currentBattle.turnCommands[b];
|
const bCommand = this.scene.currentBattle.turnCommands[b];
|
||||||
|
@ -95,6 +95,7 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
private moveSelectFilter: PokemonMoveSelectFilter;
|
private moveSelectFilter: PokemonMoveSelectFilter;
|
||||||
private tmMoveId: Moves;
|
private tmMoveId: Moves;
|
||||||
private showMovePp: boolean;
|
private showMovePp: boolean;
|
||||||
|
private slots: Map<number, number> = new Map();
|
||||||
|
|
||||||
private iconAnimHandler: PokemonIconAnimHandler;
|
private iconAnimHandler: PokemonIconAnimHandler;
|
||||||
|
|
||||||
@ -291,8 +292,11 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true);
|
this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if (this.cursor)
|
} else if (this.cursor) {
|
||||||
(this.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, this.cursor, option === PartyOption.PASS_BATON);
|
this.doSwitch(this.cursor, option);
|
||||||
|
// (this.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, this.cursor, option === PartyOption.PASS_BATON, option);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (this.partyUiMode !== PartyUiMode.MODIFIER && this.partyUiMode !== PartyUiMode.TM_MODIFIER && this.partyUiMode !== PartyUiMode.MOVE_MODIFIER)
|
if (this.partyUiMode !== PartyUiMode.MODIFIER && this.partyUiMode !== PartyUiMode.TM_MODIFIER && this.partyUiMode !== PartyUiMode.MOVE_MODIFIER)
|
||||||
ui.playSelect();
|
ui.playSelect();
|
||||||
@ -370,7 +374,11 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
} else if (this.partyUiMode === PartyUiMode.FAINT_SWITCH)
|
} else if (this.partyUiMode === PartyUiMode.FAINT_SWITCH)
|
||||||
ui.playError();
|
ui.playError();
|
||||||
else if (this.cursor === 6) {
|
else if (this.cursor === 6) {
|
||||||
console.log('DONE');
|
console.log('done');
|
||||||
|
if (this.slots[PartyOption.SEND_OUT_1])
|
||||||
|
(this.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, this.slots[PartyOption.SEND_OUT_1], false, PartyOption.SEND_OUT_1);
|
||||||
|
if (this.slots[PartyOption.SEND_OUT_2])
|
||||||
|
(this.scene.getCurrentPhase() as CommandPhase).handleCommand(Command.POKEMON, this.slots[PartyOption.SEND_OUT_2], false, PartyOption.SEND_OUT_2);
|
||||||
} else
|
} else
|
||||||
return this.processInput(Button.CANCEL);
|
return this.processInput(Button.CANCEL);
|
||||||
return true;
|
return true;
|
||||||
@ -533,7 +541,7 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showOptions() {
|
showOptions() {
|
||||||
if (this.cursor === 6)
|
if (this.cursor === 6 || this.cursor === 7)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
this.optionsMode = true;
|
this.optionsMode = true;
|
||||||
@ -752,6 +760,11 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
this.partySlots[this.transferCursor].setTransfer(false);
|
this.partySlots[this.transferCursor].setTransfer(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
doSwitch(slotIndex: integer, target: integer): void {
|
||||||
|
if (target !== PartyOption.SEND_OUT_1 && target !== PartyOption.SEND_OUT_2) return;
|
||||||
|
this.slots[target] = slotIndex;
|
||||||
|
}
|
||||||
|
|
||||||
doRelease(slotIndex: integer): void {
|
doRelease(slotIndex: integer): void {
|
||||||
this.showText(this.getReleaseMessage(this.scene.getParty()[slotIndex].name), null, () => {
|
this.showText(this.getReleaseMessage(this.scene.getParty()[slotIndex].name), null, () => {
|
||||||
this.clearPartySlots();
|
this.clearPartySlots();
|
||||||
|
Loading…
Reference in New Issue
Block a user