mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-25 00:39:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Making 3 Option UI real"

Browse Source 
This reverts commit beaad44c1e.
This commit is contained in:
frutescens 2024-09-24 17:11:45 -07:00
parent 2f9ce9d05f
commit 60931d3f25
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/phases/attempt-capture-phase.ts
View File

@ -16,7 +16,6 @@ import i18next from "i18next";
import { PokemonPhase } from "./pokemon-phase"; import { PokemonPhase } from "./pokemon-phase";
import { VictoryPhase } from "./victory-phase"; import { VictoryPhase } from "./victory-phase";
import { SubstituteTag } from "#app/data/battler-tags"; import { SubstituteTag } from "#app/data/battler-tags";
import { PreviewMode } from "#app/ui/confirm-preview-ui-handler";
export class AttemptCapturePhase extends PokemonPhase { export class AttemptCapturePhase extends PokemonPhase {
private pokeballType: PokeballType; private pokeballType: PokeballType;
@ -254,7 +253,7 @@ export class AttemptCapturePhase extends PokemonPhase {
const promptRelease = () => { const promptRelease = () => {
this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => { this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => {
this.scene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); this.scene.pokemonInfoContainer.makeRoomForConfirmUi(1, true);
this.scene.ui.setMode(Mode.CONFIRM_PREVIEW, () => { this.scene.ui.setMode(Mode.CONFIRM, () => {
const newPokemon = this.scene.addPlayerPokemon(pokemon.species, pokemon.level, pokemon.abilityIndex, pokemon.formIndex, pokemon.gender, pokemon.shiny, pokemon.variant, pokemon.ivs, pokemon.nature, pokemon); const newPokemon = this.scene.addPlayerPokemon(pokemon.species, pokemon.level, pokemon.abilityIndex, pokemon.formIndex, pokemon.gender, pokemon.shiny, pokemon.variant, pokemon.ivs, pokemon.nature, pokemon);
this.scene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => { this.scene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => {
this.scene.ui.setMode(Mode.MESSAGE).then(() => { this.scene.ui.setMode(Mode.MESSAGE).then(() => {
@ -276,7 +275,7 @@ export class AttemptCapturePhase extends PokemonPhase {
removePokemon(); removePokemon();
end(); end();
}); });
}, PreviewMode.CATCH_SUMMARY); }, "fullParty");
}); });
}; };
promptRelease(); promptRelease();

4
src/ui/ui.ts
View File

@ -54,7 +54,6 @@ import TestDialogueUiHandler from "#app/ui/test-dialogue-ui-handler";
import AutoCompleteUiHandler from "./autocomplete-ui-handler"; import AutoCompleteUiHandler from "./autocomplete-ui-handler";
import { Device } from "#enums/devices"; import { Device } from "#enums/devices";
import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler"; import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler";
import ConfirmPreviewUiHandler from "./confirm-preview-ui-handler";
export enum Mode { export enum Mode {
MESSAGE, MESSAGE,
@ -72,7 +71,6 @@ export enum Mode {
EGG_HATCH_SCENE, EGG_HATCH_SCENE,
EGG_HATCH_SUMMARY, EGG_HATCH_SUMMARY,
CONFIRM, CONFIRM,
CONFIRM_PREVIEW,
OPTION_SELECT, OPTION_SELECT,
MENU, MENU,
MENU_OPTION_SELECT, MENU_OPTION_SELECT,
@ -119,7 +117,6 @@ const transitionModes = [
const noTransitionModes = [ const noTransitionModes = [
Mode.TITLE, Mode.TITLE,
Mode.CONFIRM, Mode.CONFIRM,
Mode.CONFIRM_PREVIEW,
Mode.OPTION_SELECT, Mode.OPTION_SELECT,
Mode.MENU, Mode.MENU,
Mode.MENU_OPTION_SELECT, Mode.MENU_OPTION_SELECT,
@ -183,7 +180,6 @@ export default class UI extends Phaser.GameObjects.Container {
new EggHatchSceneHandler(scene), new EggHatchSceneHandler(scene),
new EggSummaryUiHandler(scene), new EggSummaryUiHandler(scene),
new ConfirmUiHandler(scene), new ConfirmUiHandler(scene),
new ConfirmPreviewUiHandler(scene),
new OptionSelectUiHandler(scene), new OptionSelectUiHandler(scene),
new MenuUiHandler(scene), new MenuUiHandler(scene),
new OptionSelectUiHandler(scene, Mode.MENU_OPTION_SELECT), new OptionSelectUiHandler(scene, Mode.MENU_OPTION_SELECT),