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

Changes from "Consistent/Mixed" to "Gen V + PMD"/"All Gens" Update `MusicPreferences` enum * Update locales submodule
pagefaultgames · Dec 31, 2024 · 1b6374f · 1b6374f
1 parent 6946aba
commit 1b6374f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/public/locales b/public/locales
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
@@ -174,7 +174,7 @@ export default class BattleScene extends SceneBase {
   public uiTheme: UiTheme = UiTheme.DEFAULT;
   public windowType: integer = 0;
   public experimentalSprites: boolean = false;
-  public musicPreference: number = MusicPreference.MIXED;
+  public musicPreference: number = MusicPreference.ALLGENS;
   public moveAnimations: boolean = true;
   public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT;
   public skipSeenDialogues: boolean = false;

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

diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -107,7 +107,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
       // Load bgm
       let bgmKey: string;
-      if (scene.musicPreference === MusicPreference.CONSISTENT) {
+      if (scene.musicPreference === MusicPreference.GENFIVE) {
         bgmKey = "mystery_encounter_gen_5_gts";
         scene.loadBgm(bgmKey, `${bgmKey}.mp3`);
       } else {

diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
@@ -181,8 +181,8 @@ export const SettingKeys = {
 };
 
 export enum MusicPreference {
-  CONSISTENT,
-  MIXED
+  GENFIVE,
+  ALLGENS
 }
 
 /**
@@ -670,15 +670,15 @@ export const Setting: Array<Setting> = [
     label: i18next.t("settings:musicPreference"),
     options: [
       {
-        value: "Consistent",
-        label: i18next.t("settings:consistent")
+        value: "Gen V + PMD",
+        label: i18next.t("settings:musicGenFive")
       },
       {
-        value: "Mixed",
-        label: i18next.t("settings:mixed")
+        value: "All Gens",
+        label: i18next.t("settings:musicAllGens")
       }
     ],
-    default: MusicPreference.MIXED,
+    default: MusicPreference.ALLGENS,
     type: SettingType.AUDIO,
     requireReload: true
   },
+3 −1		de/settings.json
+37 −37		en/ability-trigger.json
+108 −108		en/ability.json
+8 −8		en/achv.json
+19 −19		en/arena-tag.json
+40 −40		en/battle.json
+14 −14		en/battler-tags.json
+15 −15		en/bgm-name.json
+2 −2		en/biome.json
+1 −1		en/challenges.json
+9 −9		en/dialogue-double-battle.json
+2 −2		en/dialogue-misc.json
+632 −632		en/dialogue.json
+29 −29		en/modifier-type.json
+4 −4		en/modifier.json
+15 −15		en/move-trigger.json
+302 −302		en/move.json
+15 −15		en/mystery-encounters/a-trainers-test-dialogue.json
+5 −5		en/mystery-encounters/absolute-avarice-dialogue.json
+8 −8		en/mystery-encounters/an-offer-you-cant-refuse-dialogue.json
+2 −2		en/mystery-encounters/berries-abound-dialogue.json
+8 −8		en/mystery-encounters/bug-type-superfan-dialogue.json
+9 −9		en/mystery-encounters/clowning-around-dialogue.json
+4 −4		en/mystery-encounters/dancing-lessons-dialogue.json
+4 −4		en/mystery-encounters/dark-deal-dialogue.json
+2 −2		en/mystery-encounters/delibirdy-dialogue.json
+2 −2		en/mystery-encounters/department-store-sale-dialogue.json
+4 −4		en/mystery-encounters/field-trip-dialogue.json
+4 −4		en/mystery-encounters/fiery-fallout-dialogue.json
+3 −3		en/mystery-encounters/fight-or-flight-dialogue.json
+4 −4		en/mystery-encounters/fun-and-games-dialogue.json
+3 −3		en/mystery-encounters/global-trade-system-dialogue.json
+5 −5		en/mystery-encounters/lost-at-sea-dialogue.json
+4 −4		en/mystery-encounters/part-timer-dialogue.json
+3 −3		en/mystery-encounters/safari-zone-dialogue.json
+3 −3		en/mystery-encounters/shady-vitamin-dealer-dialogue.json
+2 −2		en/mystery-encounters/slumbering-snorlax-dialogue.json
+3 −3		en/mystery-encounters/teleporting-hijinks-dialogue.json
+5 −5		en/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
+5 −5		en/mystery-encounters/the-pokemon-salesman-dialogue.json
+3 −3		en/mystery-encounters/the-strong-stuff-dialogue.json
+7 −7		en/mystery-encounters/the-winstrate-challenge-dialogue.json
+5 −5		en/mystery-encounters/training-session-dialogue.json
+4 −4		en/mystery-encounters/trash-to-treasure-dialogue.json
+3 −3		en/mystery-encounters/uncommon-breed-dialogue.json
+3 −3		en/mystery-encounters/weird-dream-dialogue.json
+6 −6		en/party-ui-handler.json
+4 −4		en/pokemon.json
+3 −1		en/settings.json
+13 −13		en/splash-texts.json
+3 −3		en/tutorial.json
+2 −2		es-ES/command-ui-handler.json
+0 −1		es-ES/settings.json
+1 −1		fr/common.json
+1 −1		fr/dialogue-final-boss.json
+1 −1		fr/menu.json
+2 −2		fr/modifier-select-ui-handler.json
+3 −1		fr/settings.json
+54 −1		he/pokemon.json
+82 −1		it/bgm-name.json
+5 −3		it/settings.json
+18 −0		it/status-effect.json
+1 −1		ja/achv.json
+1 −1		ja/modifier-type.json
+1 −1		ja/mystery-encounters/bug-type-superfan-dialogue.json
+0 −1		ja/settings.json
+0 −1		ko/settings.json
+0 −1		pt-BR/settings.json
+0 −1		th/settings.json
+0 −1		zh-CN/settings.json
+0 −1		zh-TW/settings.json