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

Merge branch 'beta' into domain_expander

Browse Source
This commit is contained in:
Amani H. 2025-03-26 13:21:02 -04:00 committed by GitHub
commit 49585e293f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 523 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.css
View File

@ -68,6 +68,10 @@ input:-internal-autofill-selected {
background-clip: text; background-clip: text;
} }
input:-webkit-autofill {
-webkit-text-fill-color: #a1a1a1;
}
/* Need adjust input font-size */ /* Need adjust input font-size */
input { input {
font-size: 3.2rem; font-size: 3.2rem;

BIN
public/images/statuses_ca-ES.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 2.2 KiB

440
public/images/types_ca-ES.json Normal file
View File

@ -0,0 +1,440 @@
{
"textures": [
{
"image": "types_ca-ES.png",
"format": "RGBA8888",
"size": {
"w": 32,
"h": 280
},
"scale": 1,
"frames": [
{
"filename": "unknown",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
}
},
{
"filename": "bug",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 14,
"w": 32,
"h": 14
}
},
{
"filename": "dark",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 28,
"w": 32,
"h": 14
}
},
{
"filename": "dragon",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 42,
"w": 32,
"h": 14
}
},
{
"filename": "electric",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 56,
"w": 32,
"h": 14
}
},
{
"filename": "fairy",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 70,
"w": 32,
"h": 14
}
},
{
"filename": "fighting",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 84,
"w": 32,
"h": 14
}
},
{
"filename": "fire",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 98,
"w": 32,
"h": 14
}
},
{
"filename": "flying",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 112,
"w": 32,
"h": 14
}
},
{
"filename": "ghost",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 126,
"w": 32,
"h": 14
}
},
{
"filename": "grass",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 140,
"w": 32,
"h": 14
}
},
{
"filename": "ground",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 154,
"w": 32,
"h": 14
}
},
{
"filename": "ice",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 168,
"w": 32,
"h": 14
}
},
{
"filename": "normal",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 182,
"w": 32,
"h": 14
}
},
{
"filename": "poison",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 196,
"w": 32,
"h": 14
}
},
{
"filename": "psychic",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 210,
"w": 32,
"h": 14
}
},
{
"filename": "rock",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 224,
"w": 32,
"h": 14
}
},
{
"filename": "steel",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 238,
"w": 32,
"h": 14
}
},
{
"filename": "water",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 252,
"w": 32,
"h": 14
}
},
{
"filename": "stellar",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 32,
"h": 14
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 32,
"h": 14
},
"frame": {
"x": 0,
"y": 266,
"w": 32,
"h": 14
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$"
}
}

BIN
public/images/types_ca-ES.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

20
src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
View File

@ -741,6 +741,26 @@ export async function catchPokemon(
false, false,
); );
}, },
() => {
const attributes = {
shiny: pokemon.shiny,
variant: pokemon.variant,
form: pokemon.formIndex,
female: pokemon.gender === Gender.FEMALE,
};
globalScene.ui.setOverlayMode(
Mode.POKEDEX_PAGE,
pokemon.species,
pokemon.formIndex,
attributes,
null,
() => {
globalScene.ui.setMode(Mode.MESSAGE).then(() => {
promptRelease();
});
},
);
},
() => { () => {
globalScene.ui.setMode( globalScene.ui.setMode(
Mode.PARTY, Mode.PARTY,

2
src/loading-scene.ts
View File

@ -250,7 +250,7 @@ export class LoadingScene extends SceneBase {
this.loadAtlas("statuses", ""); this.loadAtlas("statuses", "");
this.loadAtlas("types", ""); this.loadAtlas("types", "");
} }
const availableLangs = ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN"]; const availableLangs = ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN", "zh-TW", "ca-ES"];
if (lang && availableLangs.includes(lang)) { if (lang && availableLangs.includes(lang)) {
this.loadImage(`pkmnday2025event-${lang}`, "events"); this.loadImage(`pkmnday2025event-${lang}`, "events");
} else { } else {

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

@ -24,6 +24,7 @@ import type { PokeballType } from "#enums/pokeball";
import { StatusEffect } from "#enums/status-effect"; import { StatusEffect } from "#enums/status-effect";
import i18next from "i18next"; import i18next from "i18next";
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import { Gender } from "#app/data/gender";
export class AttemptCapturePhase extends PokemonPhase { export class AttemptCapturePhase extends PokemonPhase {
private pokeballType: PokeballType; private pokeballType: PokeballType;
@ -321,6 +322,26 @@ export class AttemptCapturePhase extends PokemonPhase {
false, false,
); );
}, },
() => {
const attributes = {
shiny: pokemon.shiny,
variant: pokemon.variant,
form: pokemon.formIndex,
female: pokemon.gender === Gender.FEMALE,
};
globalScene.ui.setOverlayMode(
Mode.POKEDEX_PAGE,
pokemon.species,
pokemon.formIndex,
attributes,
null,
() => {
globalScene.ui.setMode(Mode.MESSAGE).then(() => {
promptRelease();
});
},
);
},
() => { () => {
globalScene.ui.setMode( globalScene.ui.setMode(
Mode.PARTY, Mode.PARTY,

8
src/system/settings/settings.ts
View File

@ -948,10 +948,10 @@ export function setSetting(setting: string, value: number): boolean {
label: "日本語", label: "日本語",
handler: () => changeLocaleHandler("ja"), handler: () => changeLocaleHandler("ja"),
}, },
// { {
// label: "Català", label: "Català",
// handler: () => changeLocaleHandler("ca-ES") handler: () => changeLocaleHandler("ca-ES")
// }, },
{ {
label: i18next.t("settings:back"), label: i18next.t("settings:back"),
handler: () => cancelHandler(), handler: () => cancelHandler(),

24
src/ui/confirm-ui-handler.ts
View File

@ -21,11 +21,12 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
show(args: any[]): boolean { show(args: any[]): boolean {
if ( if (
args.length === 4 && args.length === 5 &&
args[0] instanceof Function && args[0] instanceof Function &&
args[1] instanceof Function && args[1] instanceof Function &&
args[2] instanceof Function && args[2] instanceof Function &&
args[3] === "fullParty" args[3] instanceof Function &&
args[4] === "fullParty"
) { ) {
const config: OptionSelectConfig = { const config: OptionSelectConfig = {
options: [ options: [
@ -37,29 +38,36 @@ export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
}, },
}, },
{ {
label: i18next.t("menu:yes"), label: i18next.t("partyUiHandler:POKEDEX"),
handler: () => { handler: () => {
args[1](); args[1]();
return true; return true;
}, },
}, },
{ {
label: i18next.t("menu:no"), label: i18next.t("menu:yes"),
handler: () => { handler: () => {
args[2](); args[2]();
return true; return true;
}, },
}, },
{
label: i18next.t("menu:no"),
handler: () => {
args[3]();
return true;
},
},
], ],
delay: args.length >= 8 && args[7] !== null ? (args[7] as number) : 0, delay: args.length >= 9 && args[8] !== null ? (args[8] as number) : 0,
}; };
super.show([config]); super.show([config]);
this.switchCheck = args.length >= 5 && args[4] !== null && (args[4] as boolean); this.switchCheck = args.length >= 6 && args[5] !== null && (args[5] as boolean);
const xOffset = args.length >= 6 && args[5] !== null ? (args[5] as number) : 0; const xOffset = args.length >= 7 && args[6] !== null ? (args[6] as number) : 0;
const yOffset = args.length >= 7 && args[6] !== null ? (args[6] as number) : 0; const yOffset = args.length >= 8 && args[7] !== null ? (args[7] as number) : 0;
this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset); this.optionSelectContainer.setPosition(globalScene.game.canvas.width / 6 - 1 + xOffset, -48 + yOffset);

15
src/ui/pokedex-page-ui-handler.ts
View File

@ -261,6 +261,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
private unlockedVariants: boolean[]; private unlockedVariants: boolean[];
private canUseCandies: boolean; private canUseCandies: boolean;
private exitCallback;
constructor() { constructor() {
super(Mode.POKEDEX_PAGE); super(Mode.POKEDEX_PAGE);
@ -681,6 +682,10 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
this.filteredIndices = args[2] ?? null; this.filteredIndices = args[2] ?? null;
this.starterSetup(); this.starterSetup();
if (args[4] instanceof Function) {
this.exitCallback = args[4];
}
this.moveInfoOverlay.clear(); // clear this when removing a menu; the cancel button doesn't seem to trigger this automatically on controllers this.moveInfoOverlay.clear(); // clear this when removing a menu; the cancel button doesn't seem to trigger this automatically on controllers
this.infoOverlay.clear(); this.infoOverlay.clear();
@ -1106,7 +1111,15 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
}); });
this.blockInput = false; this.blockInput = false;
} else { } else {
ui.revertMode(); ui.revertMode()
.then(() => {
console.log("exitCallback", this.exitCallback);
if (this.exitCallback instanceof Function) {
const exitCallback = this.exitCallback;
this.exitCallback = null;
exitCallback();
}
});
success = true; success = true;
} }
} else { } else {

2
src/ui/pokemon-info-container.ts
View File

@ -458,7 +458,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
makeRoomForConfirmUi(speedMultiplier = 1, fromCatch = false): Promise<void> { makeRoomForConfirmUi(speedMultiplier = 1, fromCatch = false): Promise<void> {
const xPosition = fromCatch const xPosition = fromCatch
? this.initialX - this.infoWindowWidth - 65 ? this.initialX - this.infoWindowWidth - 67
: this.initialX - this.infoWindowWidth - ConfirmUiHandler.windowWidth; : this.initialX - this.infoWindowWidth - ConfirmUiHandler.windowWidth;
return new Promise<void>(resolve => { return new Promise<void>(resolve => {
globalScene.tweens.add({ globalScene.tweens.add({

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

@ -150,7 +150,7 @@ const languageSettings: { [key: string]: LanguageSetting } = {
instructionTextSize: "38px", instructionTextSize: "38px",
}, },
"ca-ES": { "ca-ES": {
starterInfoTextSize: "56px", starterInfoTextSize: "52px",
instructionTextSize: "38px", instructionTextSize: "38px",
}, },
}; };

1
src/utils.ts
View File

@ -464,6 +464,7 @@ export function hasAllLocalizedSprites(lang?: string): boolean {
case "pt-BR": case "pt-BR":
case "ko": case "ko":
case "ja": case "ja":
case "ca-ES":
return true; return true;
default: default:
return false; return false;