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

Level up sound no longer pauses BGM

Browse Source
This commit is contained in:
Flashfyre 2024-04-04 17:43:37 -04:00
parent 5010793a32
commit 3e99ed6bb6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/phases.ts
View File

@ -1400,7 +1400,7 @@ export class LevelCapPhase extends FieldPhase {
super.start(); super.start();
this.scene.ui.setMode(Mode.MESSAGE).then(() => { this.scene.ui.setMode(Mode.MESSAGE).then(() => {
this.scene.playSoundWithoutBgm('level_up_fanfare', 1500); this.scene.playSound('level_up_fanfare');
this.scene.ui.showText(`The level cap\nhas increased to ${this.scene.getMaxExpLevel()}!`, null, () => this.end(), null, true); this.scene.ui.showText(`The level cap\nhas increased to ${this.scene.getMaxExpLevel()}!`, null, () => this.end(), null, true);
this.executeForAll(pokemon => pokemon.updateInfo(true)); this.executeForAll(pokemon => pokemon.updateInfo(true));
}); });
@ -3128,7 +3128,7 @@ export class ModifierRewardPhase extends BattlePhase {
return new Promise<void>(resolve => { return new Promise<void>(resolve => {
const newModifier = this.modifierType.newModifier(); const newModifier = this.modifierType.newModifier();
this.scene.addModifier(newModifier).then(() => { this.scene.addModifier(newModifier).then(() => {
this.scene.playSoundWithoutBgm('item_fanfare'); this.scene.playSound('item_fanfare');
this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => resolve(), null, true); this.scene.ui.showText(`You received\n${newModifier.type.name}!`, null, () => resolve(), null, true);
}); });
}) })
@ -3146,7 +3146,7 @@ export class GameOverModifierRewardPhase extends ModifierRewardPhase {
this.scene.addModifier(newModifier).then(() => { this.scene.addModifier(newModifier).then(() => {
this.scene.gameData.saveSystem().then(success => { this.scene.gameData.saveSystem().then(success => {
if (success) { if (success) {
this.scene.playSoundWithoutBgm('level_up_fanfare'); this.scene.playSound('level_up_fanfare');
this.scene.ui.setMode(Mode.MESSAGE); this.scene.ui.setMode(Mode.MESSAGE);
this.scene.arenaBg.setVisible(false); this.scene.arenaBg.setVisible(false);
this.scene.ui.fadeIn(250).then(() => { this.scene.ui.fadeIn(250).then(() => {
@ -3261,7 +3261,7 @@ export class UnlockPhase extends Phase {
this.scene.gameData.unlocks[this.unlockable] = true; this.scene.gameData.unlocks[this.unlockable] = true;
this.scene.gameData.saveSystem().then(success => { this.scene.gameData.saveSystem().then(success => {
if (success) { if (success) {
this.scene.playSoundWithoutBgm('level_up_fanfare'); this.scene.playSound('level_up_fanfare');
this.scene.ui.setMode(Mode.MESSAGE); this.scene.ui.setMode(Mode.MESSAGE);
this.scene.arenaBg.setVisible(false); this.scene.arenaBg.setVisible(false);
this.scene.ui.fadeIn(250).then(() => { this.scene.ui.fadeIn(250).then(() => {
@ -3406,7 +3406,7 @@ export class LevelUpPhase extends PlayerPartyMemberPokemonPhase {
const prevStats = pokemon.stats.slice(0); const prevStats = pokemon.stats.slice(0);
pokemon.calculateStats(); pokemon.calculateStats();
pokemon.updateInfo(); pokemon.updateInfo();
this.scene.playSoundWithoutBgm('level_up_fanfare', 1500); this.scene.playSound('level_up_fanfare');
this.scene.ui.showText(`${this.getPokemon().name} grew to\nLv. ${this.level}!`, null, () => this.scene.ui.getMessageHandler().promptLevelUpStats(this.partyMemberIndex, prevStats, false).then(() => this.end()), null, true); this.scene.ui.showText(`${this.getPokemon().name} grew to\nLv. ${this.level}!`, null, () => this.scene.ui.getMessageHandler().promptLevelUpStats(this.partyMemberIndex, prevStats, false).then(() => this.end()), null, true);
if (this.level <= 100) { if (this.level <= 100) {
const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1); const levelMoves = this.getPokemon().getLevelMoves(this.lastLevel + 1);
@ -3455,7 +3455,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
loadMoveAnimAssets(this.scene, [ this.moveId ], true) loadMoveAnimAssets(this.scene, [ this.moveId ], true)
.then(() => { .then(() => {
this.scene.ui.setMode(messageMode).then(() => { this.scene.ui.setMode(messageMode).then(() => {
this.scene.playSoundWithoutBgm('level_up_fanfare', 1500); this.scene.playSound('level_up_fanfare');
this.scene.ui.showText(`${pokemon.name} learned\n${move.name}!`, null, () => { this.scene.ui.showText(`${pokemon.name} learned\n${move.name}!`, null, () => {
this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true); this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true);
this.end(); this.end();
@ -4147,7 +4147,7 @@ export class PartyHealPhase extends BattlePhase {
pokemon.updateInfo(true); pokemon.updateInfo(true);
} }
const healSong = this.scene.playSoundWithoutBgm('heal'); const healSong = this.scene.playSoundWithoutBgm('heal');
this.scene.time.delayedCall(healSong.totalDuration * 1000, () => { this.scene.time.delayedCall(Utils.fixedInt(healSong.totalDuration * 1000), () => {
healSong.destroy(); healSong.destroy();
if (this.resumeBgm && bgmPlaying) if (this.resumeBgm && bgmPlaying)
this.scene.playBgm(); this.scene.playBgm();

4
src/system/game-data.ts
View File

@ -972,7 +972,7 @@ export class GameData {
}; };
if (newCatch && speciesStarters.hasOwnProperty(species.speciesId)) { if (newCatch && speciesStarters.hasOwnProperty(species.speciesId)) {
this.scene.playSoundWithoutBgm('level_up_fanfare', 1500); this.scene.playSound('level_up_fanfare');
this.scene.ui.showText(`${species.name} has been\nadded as a starter!`, null, () => checkPrevolution(), null, true); this.scene.ui.showText(`${species.name} has been\nadded as a starter!`, null, () => checkPrevolution(), null, true);
} else } else
checkPrevolution(); checkPrevolution();
@ -999,7 +999,7 @@ export class GameData {
this.starterEggMoveData[speciesId] |= value; this.starterEggMoveData[speciesId] |= value;
this.scene.playSoundWithoutBgm('level_up_fanfare', 1500); this.scene.playSound('level_up_fanfare');
this.scene.ui.showText(`${eggMoveIndex === 3 ? 'Rare ' : ''}Egg Move unlocked: ${allMoves[speciesEggMoves[speciesId][eggMoveIndex]].name}`, null, () => resolve(true), null, true); this.scene.ui.showText(`${eggMoveIndex === 3 ? 'Rare ' : ''}Egg Move unlocked: ${allMoves[speciesEggMoves[speciesId][eggMoveIndex]].name}`, null, () => resolve(true), null, true);
}); });
} }