ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into pursuit-impl

This commit is contained in:
Alex Van Liew 2024-08-15 14:59:07 -07:00
parent 113e8ab3bd 88ecd69dd7
commit b057c144ac
29 changed files with 4255 additions and 4459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8653
public/images/items.json
View File

File diff suppressed because it is too large Load Diff

BIN
public/images/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 56 KiB

BIN
public/images/items/power_herb.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 314 B

BIN
public/images/items/ribbon-gen1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 642 B

BIN
public/images/items/ribbon-gen2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 666 B

BIN
public/images/items/ribbon-gen3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 702 B

BIN
public/images/items/ribbon-gen4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 675 B

BIN
public/images/items/ribbon-gen5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 702 B

BIN
public/images/items/ribbon-gen6.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 633 B

BIN
public/images/items/ribbon-gen7.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 636 B

BIN
public/images/items/ribbon-gen8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 627 B

BIN
public/images/items/ribbon-gen9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 642 B

BIN
public/images/items/white_herb.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 314 B

1
src/data/pokemon-forms.ts
View File

@ -630,6 +630,7 @@ export const pokemonFormChanges: PokemonFormChanges = {
[Species.MELOETTA]: [
new SpeciesFormChange(Species.MELOETTA, "aria", "pirouette", new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true),
new SpeciesFormChange(Species.MELOETTA, "pirouette", "aria", new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true),
new SpeciesFormChange(Species.MELOETTA, "pirouette", "aria", new SpeciesFormChangeActiveTrigger(false), true)
],
[Species.GENESECT]: [
new SpeciesFormChange(Species.GENESECT, "", "shock", new SpeciesFormChangeItemTrigger(FormChangeItem.SHOCK_DRIVE)),

2
src/data/pokemon-species.ts
View File

@ -1870,7 +1870,7 @@ export function initSpecies() {
),
new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, GrowthRate.SLOW, null, false, true,
new PokemonForm("Aria Forme", "aria", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, false, null, true),
new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270, false, null, true),
new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270),
),
new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true,
new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true),

1
src/locales/ca_ES/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

1
src/locales/de/pokemon-form.ts
View File

@ -89,7 +89,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Inkarnationsform",
"keldeoOrdinary": "Standardform",
"meloettaAria": "Gesangsform",
"meloettaPirouette": "Tanzform",
// 6G
"froakieBattleBond": "Ash-Form",
"scatterbugMeadow": "Blumenmeermuster",

1
src/locales/en/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

3
src/locales/es/pokemon-form.ts
View File

@ -87,8 +87,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"thundurusIncarnate": "Incarnate",
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Lírica",
"meloettaPirouette": "Danza",
"meloettaAria": "Aria",
// 6G
"froakieBattleBond": "Fuerte Afecto",
"scatterbugMeadow": "Floral",

1
src/locales/fr/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Avatar",
"keldeoOrdinary": "Normal",
"meloettaAria": "Chant",
"meloettaPirouette": "Danse",
// 6G
"froakieBattleBond": "Synergie",
"scatterbugMeadow": "Floraison",

1
src/locales/it/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnazione",
"keldeoOrdinary": "Normale",
"meloettaAria": "Canto",
"meloettaPirouette": "Danza",
// 6G
"froakieBattleBond": "Morfosintonia",
"scatterbugMeadow": "Giardinfiore",

1
src/locales/ja/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

1
src/locales/ko/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "화신폼",
"keldeoOrdinary": "평상시 모습",
"meloettaAria": "보이스폼",
"meloettaPirouette": "스텝폼",
// 6G
"froakieBattleBond": "유대변화",
"scatterbugMeadow": "화원의 모양",

1
src/locales/pt_BR/pokemon-form.ts
View File

@ -89,7 +89,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirueta",
// 6G
"froakieBattleBond": "Vínculo de Batalha",
"scatterbugMeadow": "Prado",

1
src/locales/zh_CN/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "化身",
"keldeoOrdinary": "通常",
"meloettaAria": "歌声",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "牵绊变身",
"scatterbugMeadow": "花园花纹",

1
src/locales/zh_TW/pokemon-form.ts
View File

@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

4
src/phases.ts
View File

@ -2132,7 +2132,7 @@ export class CommandPhase extends FieldPhase {
}),
null,
() => {
this.scene.ui.showText(null, 0);
this.scene.ui.showText("", 0);
if (!isSwitch) {
this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
}
@ -2142,7 +2142,7 @@ export class CommandPhase extends FieldPhase {
this.scene.ui.setMode(Mode.MESSAGE);
}
this.scene.ui.showText(trappedAbMessages[0], null, () => {
this.scene.ui.showText(null, 0);
this.scene.ui.showText("", 0);
if (!isSwitch) {
this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
}

22
src/ui/party-ui-handler.ts
View File

@ -382,7 +382,7 @@ export default class PartyUiHandler extends MessageUiHandler {
this.clearOptions();
} else {
this.clearOptions();
this.showText(filterResult as string, undefined, () => this.showText(null, 0), undefined, true);
this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true);
}
ui.playSelect();
return true;
@ -449,7 +449,7 @@ export default class PartyUiHandler extends MessageUiHandler {
return true;
} else {
this.clearOptions();
this.showText(filterResult as string, undefined, () => this.showText(null, 0), undefined, true);
this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true);
}
} else if (option === PartyOption.SUMMARY) {
ui.playSelect();
@ -459,7 +459,7 @@ export default class PartyUiHandler extends MessageUiHandler {
this.clearOptions();
ui.playSelect();
pokemon.pauseEvolutions = false;
this.showText(i18next.t("partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon) }), undefined, () => this.showText(null, 0), null, true);
this.showText(i18next.t("partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon) }), undefined, () => this.showText("", 0), null, true);
} else if (option === PartyOption.UNSPLICE) {
this.clearOptions();
ui.playSelect();
@ -472,12 +472,12 @@ export default class PartyUiHandler extends MessageUiHandler {
ui.setMode(Mode.PARTY);
this.showText(i18next.t("partyUiHandler:wasReverted", { fusionName: fusionName, pokemonName: pokemon.name }), undefined, () => {
ui.setMode(Mode.PARTY);
this.showText(null, 0);
this.showText("", 0);
}, null, true);
});
}, () => {
ui.setMode(Mode.PARTY);
this.showText(null, 0);
this.showText("", 0);
});
});
} else if (option === PartyOption.RELEASE) {
@ -490,11 +490,11 @@ export default class PartyUiHandler extends MessageUiHandler {
this.doRelease(this.cursor);
}, () => {
ui.setMode(Mode.PARTY);
this.showText(null, 0);
this.showText("", 0);
});
});
} else {
this.showText(i18next.t("partyUiHandler:releaseInBattle"), null, () => this.showText(null, 0), null, true);
this.showText(i18next.t("partyUiHandler:releaseInBattle"), null, () => this.showText("", 0), null, true);
}
return true;
} else if (option === PartyOption.RENAME) {
@ -730,8 +730,8 @@ export default class PartyUiHandler extends MessageUiHandler {
return changed;
}
showText(text: string | null, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) {
if (text === null) {
showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null) {
if (text.length === 0) {
text = defaultMessage;
}
@ -1057,7 +1057,7 @@ export default class PartyUiHandler extends MessageUiHandler {
this.selectCallback = null;
selectCallback && selectCallback(this.cursor, PartyOption.RELEASE);
}
this.showText(null, 0);
this.showText("", 0);
}, null, true);
}
@ -1119,7 +1119,7 @@ export default class PartyUiHandler extends MessageUiHandler {
this.eraseOptionsCursor();
this.partyMessageBox.setSize(262, 30);
this.showText(null, 0);
this.showText("", 0);
}
eraseOptionsCursor() {

19
src/ui/ui.ts
View File

@ -271,8 +271,8 @@ export default class UI extends Phaser.GameObjects.Container {
return handler.processInput(button);
}
showText(text: string | null, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null): void {
if (text && prompt && text.indexOf("$") > -1) {
showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null): void {
if (prompt && text.indexOf("$") > -1) {
const messagePages = text.split(/\$/g).map(m => m.trim());
let showMessageAndCallback = () => callback && callback();
for (let p = messagePages.length - 1; p >= 0; p--) {
@ -282,17 +282,12 @@ export default class UI extends Phaser.GameObjects.Container {
showMessageAndCallback();
} else {
const handler = this.getHandler();
if (handler instanceof PartyUiHandler) {
(handler as PartyUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay);
return;
}
if (text) {
if (handler instanceof MessageUiHandler) {
(handler as MessageUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay);
} else {
this.getMessageHandler().showText(text, delay, callback, callbackDelay, prompt, promptDelay);
}
if (handler instanceof MessageUiHandler) {
(handler as MessageUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay);
} else {
this.getMessageHandler().showText(text, delay, callback, callbackDelay, prompt, promptDelay);
}
}
}