From 60931d3f25fe7e31bf295fe8bef285a3fee84603 Mon Sep 17 00:00:00 2001 From: frutescens Date: Tue, 24 Sep 2024 17:11:45 -0700 Subject: [PATCH] Revert "Making 3 Option UI real" This reverts commit beaad44c1eb098a09cfd2d04043d878d24f494c1. --- src/phases/attempt-capture-phase.ts | 5 ++--- src/ui/ui.ts | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index d5cb4a6550b..53723526c14 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -16,7 +16,6 @@ import i18next from "i18next"; import { PokemonPhase } from "./pokemon-phase"; import { VictoryPhase } from "./victory-phase"; import { SubstituteTag } from "#app/data/battler-tags"; -import { PreviewMode } from "#app/ui/confirm-preview-ui-handler"; export class AttemptCapturePhase extends PokemonPhase { private pokeballType: PokeballType; @@ -254,7 +253,7 @@ export class AttemptCapturePhase extends PokemonPhase { const promptRelease = () => { this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => { 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); this.scene.ui.setMode(Mode.SUMMARY, newPokemon, 0, SummaryUiMode.DEFAULT, () => { this.scene.ui.setMode(Mode.MESSAGE).then(() => { @@ -276,7 +275,7 @@ export class AttemptCapturePhase extends PokemonPhase { removePokemon(); end(); }); - }, PreviewMode.CATCH_SUMMARY); + }, "fullParty"); }); }; promptRelease(); diff --git a/src/ui/ui.ts b/src/ui/ui.ts index af78b4d49ae..7e00c87cc5f 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -54,7 +54,6 @@ import TestDialogueUiHandler from "#app/ui/test-dialogue-ui-handler"; import AutoCompleteUiHandler from "./autocomplete-ui-handler"; import { Device } from "#enums/devices"; import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler"; -import ConfirmPreviewUiHandler from "./confirm-preview-ui-handler"; export enum Mode { MESSAGE, @@ -72,7 +71,6 @@ export enum Mode { EGG_HATCH_SCENE, EGG_HATCH_SUMMARY, CONFIRM, - CONFIRM_PREVIEW, OPTION_SELECT, MENU, MENU_OPTION_SELECT, @@ -119,7 +117,6 @@ const transitionModes = [ const noTransitionModes = [ Mode.TITLE, Mode.CONFIRM, - Mode.CONFIRM_PREVIEW, Mode.OPTION_SELECT, Mode.MENU, Mode.MENU_OPTION_SELECT, @@ -183,7 +180,6 @@ export default class UI extends Phaser.GameObjects.Container { new EggHatchSceneHandler(scene), new EggSummaryUiHandler(scene), new ConfirmUiHandler(scene), - new ConfirmPreviewUiHandler(scene), new OptionSelectUiHandler(scene), new MenuUiHandler(scene), new OptionSelectUiHandler(scene, Mode.MENU_OPTION_SELECT),