random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-11-29 10:16:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues described by HopsWas

Browse Source
This commit is contained in:
Frutescens 2024-06-10 13:04:16 -07:00
parent bd86fc6459
commit 14ff290b74
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/phases.ts
View File

@ -4820,7 +4820,7 @@ export class AttemptCapturePhase extends PokemonPhase {
} }
}, },
onComplete: () => { onComplete: () => {
this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex)); this.catch(); this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex)); this.scene.gameData.setPokemonCaught(pokemon); this.catch();
} }
}); });
}; };
@ -4915,7 +4915,7 @@ export class AttemptCapturePhase extends PokemonPhase {
} }
}); });
}; };
Promise.all([ pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon) ]).then(() => { Promise.all([ pokemon.hideInfo() ]).then(() => {
if (this.scene.getParty().length === 6) { if (this.scene.getParty().length === 6) {
const promptRelease = () => { const promptRelease = () => {
this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => { this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => {

8
src/ui/summary-ui-handler.ts
View File

@ -485,10 +485,10 @@ export default class SummaryUiHandler extends UiHandler {
if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) { if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
this.hideMoveSelect(); this.hideMoveSelect();
} else { } else {
if (!ui.getMessageHandler().onActionInput) { if (ui.getMessageHandler().onActionInput) {
ui.setMode(Mode.PARTY);
} else {
ui.setMode(Mode.MESSAGE); ui.setMode(Mode.MESSAGE);
} else {
ui.setMode(Mode.PARTY);
} }
} }
success = true; success = true;
@ -499,6 +499,8 @@ export default class SummaryUiHandler extends UiHandler {
case Button.DOWN: case Button.DOWN:
if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) { if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
break; break;
} else if (ui.getMessageHandler().onActionInput) {
break;
} }
const isDown = button === Button.DOWN; const isDown = button === Button.DOWN;
const party = this.scene.getParty(); const party = this.scene.getParty();