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

Merge branch 'hotfix-1.11.2' into shiny-daily-starters

Browse Source
This commit is contained in:
Wlowscha 2025-11-01 00:23:03 +01:00 committed by GitHub
commit 92d03e5cfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/handlers/egg-gacha-ui-handler.ts
View File

@ -81,7 +81,7 @@ export class EggGachaUiHandler extends MessageUiHandler {
let pokemonIconX = -20; let pokemonIconX = -20;
let pokemonIconY = 6; let pokemonIconY = 6;
if (["de", "es-ES", "es-419", "fr", "ko", "pt-BR", "ja", "ru"].includes(currentLanguage)) { if (["de", "es-ES", "es-419", "fr", "ko", "pt-BR", "ja", "ru", "tr"].includes(currentLanguage)) {
gachaTextStyle = TextStyle.SMALLER_WINDOW_ALT; gachaTextStyle = TextStyle.SMALLER_WINDOW_ALT;
gachaX = 2; gachaX = 2;
gachaY = 2; gachaY = 2;
@ -89,7 +89,7 @@ export class EggGachaUiHandler extends MessageUiHandler {
let legendaryLabelX = gachaX; let legendaryLabelX = gachaX;
let legendaryLabelY = gachaY; let legendaryLabelY = gachaY;
if (["de", "es-ES", "es-419"].includes(currentLanguage)) { if (["de", "es-ES", "es-419", "tr"].includes(currentLanguage)) {
pokemonIconX = -25; pokemonIconX = -25;
pokemonIconY = 10; pokemonIconY = 10;
legendaryLabelX = -6; legendaryLabelX = -6;
@ -108,8 +108,7 @@ export class EggGachaUiHandler extends MessageUiHandler {
let xOffset = 0; let xOffset = 0;
const pokemonIcon = globalScene.add.sprite(pokemonIconX, pokemonIconY, "pokemon_icons_0"); const pokemonIcon = globalScene.add.sprite(pokemonIconX, pokemonIconY, "pokemon_icons_0");
// Intentionally left as "array includes" instead of an equality check to allow for future languages to reuse if (["pt-BR", "tr"].includes(currentLanguage)) {
if (["pt-BR"].includes(currentLanguage)) {
xOffset = 2; xOffset = 2;
pokemonIcon.setX(pokemonIconX - 2); pokemonIcon.setX(pokemonIconX - 2);
} }
@ -120,14 +119,14 @@ export class EggGachaUiHandler extends MessageUiHandler {
} }
break; break;
case GachaType.MOVE: case GachaType.MOVE:
if (["de", "es-ES", "fr", "pt-BR", "ru"].includes(currentLanguage)) { if (["de", "es-ES", "fr", "pt-BR", "ru", "tr"].includes(currentLanguage)) {
gachaUpLabel.setAlign("center").setY(0); gachaUpLabel.setAlign("center").setY(0);
} }
gachaUpLabel.setText(i18next.t("egg:moveUpGacha")).setX(0).setOrigin(0.5, 0); gachaUpLabel.setText(i18next.t("egg:moveUpGacha")).setX(0).setOrigin(0.5, 0);
break; break;
case GachaType.SHINY: case GachaType.SHINY:
if (["de", "fr", "ko", "ru"].includes(currentLanguage)) { if (["de", "fr", "ko", "ru", "tr"].includes(currentLanguage)) {
gachaUpLabel.setAlign("center").setY(0); gachaUpLabel.setAlign("center").setY(0);
} }

2
src/ui/handlers/game-stats-ui-handler.ts
View File

@ -251,7 +251,7 @@ export class GameStatsUiHandler extends UiHandler {
const resolvedLang = i18next.resolvedLanguage ?? "en"; const resolvedLang = i18next.resolvedLanguage ?? "en";
// NOTE TO TRANSLATION TEAM: Add more languages that want to display // NOTE TO TRANSLATION TEAM: Add more languages that want to display
// in a single-column inside of the `[]` (e.g. `["ru", "fr"]`) // in a single-column inside of the `[]` (e.g. `["ru", "fr"]`)
return ["fr", "es-ES", "es-419", "it", "ja", "pt-BR", "ru"].includes(resolvedLang); return ["fr", "es-ES", "es-419", "it", "ja", "pt-BR", "ru", "tr"].includes(resolvedLang);
} }
/** The number of columns used by this menu in the resolved language */ /** The number of columns used by this menu in the resolved language */
private get columnCount(): 1 | 2 { private get columnCount(): 1 | 2 {

1
src/ui/handlers/starter-select-ui-handler.ts
View File

@ -155,6 +155,7 @@ const languageSettings: { [key: string]: LanguageSetting } = {
tr: { tr: {
starterInfoTextSize: "56px", starterInfoTextSize: "56px",
instructionTextSize: "38px", instructionTextSize: "38px",
starterInfoXPos: 34,
}, },
ro: { ro: {
starterInfoTextSize: "56px", starterInfoTextSize: "56px",