mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-01 22:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into chilly-reception-msg

Browse Source
This commit is contained in:
Bertie690 2025-05-20 11:55:49 -04:00 committed by GitHub
commit 05b83eaf0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit a074ddb28c3f0c7e9bbd0560efa33e3ce5f71bcd Subproject commit 42cd5cf577f475c22bc82d55e7ca358eb4f3184f

3
src/ui/ball-ui-handler.ts
View File

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

4
src/ui/egg-gacha-ui-handler.ts
View File

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

4
src/ui/starter-select-ui-handler.ts
View File

@ -145,8 +145,10 @@ const languageSettings: { [key: string]: LanguageSetting } = {
starterInfoXPos: 33, starterInfoXPos: 33,
}, },
ko: { ko: {
starterInfoTextSize: "52px", starterInfoTextSize: "60px",
instructionTextSize: "38px", instructionTextSize: "38px",
starterInfoYOffset: -0.5,
starterInfoXPos: 30,
}, },
ja: { ja: {
starterInfoTextSize: "51px", starterInfoTextSize: "51px",