random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-11-30 02:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4089 from ben-lear/mystery-encounters-feedback

Browse Source 
add BGM music names for ME music
This commit is contained in:
ImperialSympathizer 2024-09-07 11:56:18 -04:00 committed by GitHub
commit 4a3921b5c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,10 +93,10 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
// Load bgm // Load bgm
if (scene.musicPreference === 0) { if (scene.musicPreference === 0) {
scene.loadBgm("mystery_encounter_gts", "mystery_encounter_gen_5_gts.mp3"); scene.loadBgm("mystery_encounter_gen_5_gts", "mystery_encounter_gen_5_gts.mp3");
} else { } else {
// Mixed option // Mixed option
scene.loadBgm("mystery_encounter_gts", "mystery_encounter_gen_6_gts.mp3"); scene.loadBgm("mystery_encounter_gen_6_gts", "mystery_encounter_gen_6_gts.mp3");
} }
// Load possible trade options // Load possible trade options
@ -113,7 +113,11 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
// Change the bgm // Change the bgm
scene.fadeOutBgm(1500, false); scene.fadeOutBgm(1500, false);
scene.time.delayedCall(1500, () => { scene.time.delayedCall(1500, () => {
scene.playBgm("mystery_encounter_gts"); if (scene.musicPreference === 0) {
scene.playBgm("mystery_encounter_gen_5_gts");
} else {
scene.playBgm("mystery_encounter_gen_6_gts");
}
}); });
return true; return true;

7
src/locales/en/bgm-name.json
View File

@ -146,5 +146,10 @@
"encounter_youngster": "BW Trainers' Eyes Meet (Youngster)", "encounter_youngster": "BW Trainers' Eyes Meet (Youngster)",
"heal": "BW Pokémon Heal", "heal": "BW Pokémon Heal",
"menu": "PMD EoS Welcome to the World of Pokémon!", "menu": "PMD EoS Welcome to the World of Pokémon!",
"title": "PMD EoS Top Menu Theme" "title": "PMD EoS Top Menu Theme",
"mystery_encounter_weird_dream": "PMD EoS Temporal Spire",
"mystery_encounter_fun_and_games": "PMD EoS Guildmaster Wigglytuff",
"mystery_encounter_gen_5_gts": "BW GTS",
"mystery_encounter_gen_6_gts": "XY GTS"
} }

10
src/modifier/modifier-type.ts
View File

@ -125,12 +125,10 @@ export class ModifierType {
* @param poolType - Default 'ModifierPoolType.PLAYER'. Which pool to lookup item tier from * @param poolType - Default 'ModifierPoolType.PLAYER'. Which pool to lookup item tier from
*/ */
withTierFromPool(poolType: ModifierPoolType = ModifierPoolType.PLAYER): ModifierType { withTierFromPool(poolType: ModifierPoolType = ModifierPoolType.PLAYER): ModifierType {
const modifierPool = getModifierPoolForType(poolType); for (const tier of Object.values(getModifierPoolForType(poolType))) {
for (const modifier of tier) {
for (const weightedModifiers of Object.values(modifierPool)) { if (this.id === modifier.modifierType.id) {
for (const mod of weightedModifiers) { this.tier = modifier.modifierType.tier;
if (mod.modifierType.id === this.id) {
this.tier = mod.modifierType.tier;
return this; return this;
} }
} }