random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-01-15 13:31:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UI/UX] Change label for music settings (#5053)

Browse Source 
Changes from "Consistent/Mixed" to "Gen V + PMD"/"All Gens"

Update `MusicPreferences` enum

* Update locales submodule
This commit is contained in:
NightKev 2024-12-30 18:55:28 -08:00 committed by GitHub
parent 6946abadb8
commit 1b6374f469
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85 Subproject commit b28ba1255c8db12cb07947f88635cb6be0143a15

2
src/battle-scene.ts
View File

@ -174,7 +174,7 @@ export default class BattleScene extends SceneBase {
public uiTheme: UiTheme = UiTheme.DEFAULT; public uiTheme: UiTheme = UiTheme.DEFAULT;
public windowType: integer = 0; public windowType: integer = 0;
public experimentalSprites: boolean = false; public experimentalSprites: boolean = false;
public musicPreference: number = MusicPreference.MIXED; public musicPreference: number = MusicPreference.ALLGENS;
public moveAnimations: boolean = true; public moveAnimations: boolean = true;
public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT; public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT;
public skipSeenDialogues: boolean = false; public skipSeenDialogues: boolean = false;

6
src/battle.ts
View File

@ -222,7 +222,7 @@ export default class Battle {
if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) { if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) {
return `encounter_${this.trainer?.getEncounterBgm()}`; return `encounter_${this.trainer?.getEncounterBgm()}`;
} }
if (scene.musicPreference === MusicPreference.CONSISTENT) { if (scene.musicPreference === MusicPreference.GENFIVE) {
return this.trainer?.getBattleBgm() ?? null; return this.trainer?.getBattleBgm() ?? null;
} else { } else {
return this.trainer?.getMixedBattleBgm() ?? null; return this.trainer?.getMixedBattleBgm() ?? null;
@ -239,7 +239,7 @@ export default class Battle {
return "battle_final_encounter"; return "battle_final_encounter";
} }
if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) { if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) {
if (scene.musicPreference === MusicPreference.CONSISTENT) { if (scene.musicPreference === MusicPreference.GENFIVE) {
switch (pokemon.species.speciesId) { switch (pokemon.species.speciesId) {
case Species.REGIROCK: case Species.REGIROCK:
case Species.REGICE: case Species.REGICE:
@ -256,7 +256,7 @@ export default class Battle {
} }
return "battle_legendary_unova"; return "battle_legendary_unova";
} }
} else if (scene.musicPreference === MusicPreference.MIXED) { } else if (scene.musicPreference === MusicPreference.ALLGENS) {
switch (pokemon.species.speciesId) { switch (pokemon.species.speciesId) {
case Species.ARTICUNO: case Species.ARTICUNO:
case Species.ZAPDOS: case Species.ZAPDOS:

2
src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
View File

@ -107,7 +107,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
// Load bgm // Load bgm
let bgmKey: string; let bgmKey: string;
if (scene.musicPreference === MusicPreference.CONSISTENT) { if (scene.musicPreference === MusicPreference.GENFIVE) {
bgmKey = "mystery_encounter_gen_5_gts"; bgmKey = "mystery_encounter_gen_5_gts";
scene.loadBgm(bgmKey, `${bgmKey}.mp3`); scene.loadBgm(bgmKey, `${bgmKey}.mp3`);
} else { } else {

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

@ -181,8 +181,8 @@ export const SettingKeys = {
}; };
export enum MusicPreference { export enum MusicPreference {
CONSISTENT, GENFIVE,
MIXED ALLGENS
} }
/** /**
@ -670,15 +670,15 @@ export const Setting: Array<Setting> = [
label: i18next.t("settings:musicPreference"), label: i18next.t("settings:musicPreference"),
options: [ options: [
{ {
value: "Consistent", value: "Gen V + PMD",
label: i18next.t("settings:consistent") label: i18next.t("settings:musicGenFive")
}, },
{ {
value: "Mixed", value: "All Gens",
label: i18next.t("settings:mixed") label: i18next.t("settings:musicAllGens")
} }
], ],
default: MusicPreference.MIXED, default: MusicPreference.ALLGENS,
type: SettingType.AUDIO, type: SettingType.AUDIO,
requireReload: true requireReload: true
}, },