external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3216 from Agetian/event-music

Browse Source 
Add music back to town events/draft scene
This commit is contained in:
Anthony Calosa
2023-06-07 13:39:10 +08:00
committed by GitHub
parent 2d59092214 7c2133d0a7
commit b73c6a511b
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/adventure/scene/DraftScene.java
View File

@@ -3,6 +3,7 @@ package forge.adventure.scene;
import forge.adventure.data.AdventureEventData; import forge.adventure.data.AdventureEventData;
import forge.adventure.stage.GameHUD; import forge.adventure.stage.GameHUD;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.sound.MusicPlaylist;
import forge.sound.SoundSystem; import forge.sound.SoundSystem;
/** /**
@@ -32,7 +33,8 @@ public class DraftScene extends ForgeScene {
@Override @Override
public void enter() { public void enter() {
GameHUD.getInstance().getTouchpad().setVisible(false); GameHUD.getInstance().getTouchpad().setVisible(false);
SoundSystem.instance.pause(); GameHUD.getInstance().pauseMusic();
SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
screen = null; screen = null;
getScreen(); getScreen();
screen.refresh(); screen.refresh();

5
forge-gui-mobile/src/forge/adventure/scene/EventScene.java
View File

@@ -13,12 +13,14 @@ import forge.Forge;
import forge.adventure.character.EnemySprite; import forge.adventure.character.EnemySprite;
import forge.adventure.data.*; import forge.adventure.data.*;
import forge.adventure.player.AdventurePlayer; import forge.adventure.player.AdventurePlayer;
import forge.adventure.stage.GameHUD;
import forge.adventure.stage.IAfterMatch; import forge.adventure.stage.IAfterMatch;
import forge.adventure.stage.WorldStage; import forge.adventure.stage.WorldStage;
import forge.adventure.util.*; import forge.adventure.util.*;
import forge.adventure.world.WorldSave; import forge.adventure.world.WorldSave;
import forge.gui.FThreads; import forge.gui.FThreads;
import forge.screens.TransitionScreen; import forge.screens.TransitionScreen;
import forge.sound.MusicPlaylist;
import forge.sound.SoundSystem; import forge.sound.SoundSystem;
import forge.util.Callback; import forge.util.Callback;
import forge.util.MyRandom; import forge.util.MyRandom;
@@ -378,7 +380,8 @@ public class EventScene extends MenuScene implements IAfterMatch {
@Override @Override
public void enter() { public void enter() {
super.enter(); super.enter();
SoundSystem.instance.pause(); GameHUD.getInstance().pauseMusic();
SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
scrollContainer.clear(); scrollContainer.clear();
if (money != null) { if (money != null) {

7
forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java
View File

@@ -17,6 +17,7 @@ import forge.adventure.character.EnemySprite;
import forge.adventure.data.EnemyData; import forge.adventure.data.EnemyData;
import forge.adventure.data.WorldData; import forge.adventure.data.WorldData;
import forge.adventure.player.AdventurePlayer; import forge.adventure.player.AdventurePlayer;
import forge.adventure.stage.GameHUD;
import forge.adventure.util.Config; import forge.adventure.util.Config;
import forge.adventure.util.Controls; import forge.adventure.util.Controls;
import forge.adventure.util.Current; import forge.adventure.util.Current;
@@ -31,6 +32,8 @@ import forge.localinstance.achievements.CardActivationAchievements;
import forge.localinstance.achievements.PlaneswalkerAchievements; import forge.localinstance.achievements.PlaneswalkerAchievements;
import forge.model.FModel; import forge.model.FModel;
import forge.player.GamePlayerUtil; import forge.player.GamePlayerUtil;
import forge.sound.MusicPlaylist;
import forge.sound.SoundSystem;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import java.util.Map; import java.util.Map;
@@ -186,6 +189,10 @@ public class PlayerStatisticScene extends UIScene {
@Override @Override
public void enter() { public void enter() {
super.enter(); super.enter();
GameHUD.getInstance().pauseMusic();
SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
achievementContainer.clear(); achievementContainer.clear();
updateAchievements(cardActivation, true); updateAchievements(cardActivation, true);
updateAchievements(planeswalkers, true); updateAchievements(planeswalkers, true);