mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-13 11:52:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from flx-sta/refactor/3672-adapt-async-await

Browse Source 
adapt learn-move-phase to `async-await`
This commit is contained in:
Mumble 2024-09-05 11:54:24 -07:00 committed by GitHub
commit 5531a2f46e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/phases/learn-move-phase.ts
View File

@ -55,19 +55,20 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
* @param move The Move to be learned
* @param Pokemon The Pokemon learning the move
*/
replaceMoveCheck(move: Move, pokemon: Pokemon) {
async replaceMoveCheck(move: Move, pokemon: Pokemon) {
const learnMovePrompt = i18next.t("battle:learnMovePrompt", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name });
const moveLimitReached = i18next.t("battle:learnMoveLimitReached", { pokemonName: getPokemonNameWithAffix(pokemon) });
const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", { moveName: move.name });
const preQText = [learnMovePrompt, moveLimitReached].join("$");
this.scene.ui.showTextPromise(preQText)
.then(() => this.scene.ui.showTextPromise(shouldReplaceQ, undefined, false))
.then(() => this.scene.ui.setModeWithoutClear(Mode.CONFIRM,
await this.scene.ui.showTextPromise(preQText);
await this.scene.ui.showTextPromise(shouldReplaceQ, undefined, false);
await this.scene.ui.setModeWithoutClear(Mode.CONFIRM,
() => this.forgetMoveProcess(move, pokemon), // Yes
() => { // No
this.scene.ui.setMode(this.messageMode);
this.rejectMoveAndEnd(move, pokemon);
}));
}
);
}
/**
@ -81,11 +82,10 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
* @param move The Move to be learned
* @param Pokemon The Pokemon learning the move
*/
forgetMoveProcess(move: Move, pokemon: Pokemon) {
async forgetMoveProcess(move: Move, pokemon: Pokemon) {
this.scene.ui.setMode(this.messageMode);
this.scene.ui.showTextPromise(i18next.t("battle:learnMoveForgetQuestion"), undefined, true)
.then(() => {
this.scene.ui.setModeWithoutClear(Mode.SUMMARY, pokemon, SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => {
await this.scene.ui.showTextPromise(i18next.t("battle:learnMoveForgetQuestion"), undefined, true);
await this.scene.ui.setModeWithoutClear(Mode.SUMMARY, pokemon, SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => {
if (moveIndex === 4) {
this.scene.ui.setMode(this.messageMode).then(() => this.rejectMoveAndEnd(move, pokemon));
return;
@ -94,7 +94,6 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
const fullText = [i18next.t("battle:countdownPoof"), forgetSuccessText, i18next.t("battle:learnMoveAnd")].join("$");
this.scene.ui.setMode(this.messageMode).then(() => this.learnMove(moveIndex, move, pokemon, fullText));
});
});
}
/**
@ -107,8 +106,8 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
* @param move The Move to be learned
* @param Pokemon The Pokemon learning the move
*/
rejectMoveAndEnd(move: Move, pokemon: Pokemon) {
this.scene.ui.showTextPromise(i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), undefined, false).then(()=> {
async rejectMoveAndEnd(move: Move, pokemon: Pokemon) {
await this.scene.ui.showTextPromise(i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), undefined, false);
this.scene.ui.setModeWithoutClear(Mode.CONFIRM,
() => {
this.scene.ui.setMode(this.messageMode);
@ -119,7 +118,6 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
this.replaceMoveCheck(move, pokemon);
}
);
});
}
/**