Merge branch 'beta' into korean-starterInfoTextSize

This commit is contained in:
damocleas 2025-05-19 18:46:54 -04:00 committed by GitHub
commit a7378e27b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions

View File

@ -7,6 +7,7 @@ import { addWindow } from "./ui-theme";
import { Button } from "#enums/buttons";
import type { CommandPhase } from "#app/phases/command-phase";
import { globalScene } from "#app/global-scene";
import i18next from "i18next";
export default class BallUiHandler extends UiHandler {
private pokeballSelectContainer: Phaser.GameObjects.Container;
@ -31,7 +32,7 @@ export default class BallUiHandler extends UiHandler {
for (let pb = 0; pb < Object.keys(globalScene.pokeballCounts).length; pb++) {
optionsTextContent += `${getPokeballName(pb)}\n`;
}
optionsTextContent += "Cancel";
optionsTextContent += i18next.t("pokeball:cancel");
const optionsText = addTextObject(0, 0, optionsTextContent, TextStyle.WINDOW, { align: "right", maxLines: 6 });
const optionsTextWidth = optionsText.displayWidth;
this.pokeballSelectContainer = globalScene.add.container(

View File

@ -108,7 +108,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
let pokemonIconX = -20;
let pokemonIconY = 6;
if (["de", "es-ES", "fr", "ko", "pt-BR"].includes(currentLanguage)) {
if (["de", "es-ES", "es-MX", "fr", "ko", "pt-BR"].includes(currentLanguage)) {
gachaTextStyle = TextStyle.SMALLER_WINDOW_ALT;
gachaX = 2;
gachaY = 2;
@ -116,7 +116,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
let legendaryLabelX = gachaX;
let legendaryLabelY = gachaY;
if (["de", "es-ES"].includes(currentLanguage)) {
if (["de", "es-ES", "es-MX"].includes(currentLanguage)) {
pokemonIconX = -25;
pokemonIconY = 10;
legendaryLabelX = -6;