diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java index bc21ed3329f..f2a75c51e49 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java @@ -2,11 +2,7 @@ package forge.adventure.scene; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.InputEvent; -import com.badlogic.gdx.scenes.scene2d.ui.Dialog; -import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.ui.Table; -import com.badlogic.gdx.scenes.scene2d.ui.TextField; -import com.badlogic.gdx.scenes.scene2d.ui.Window; +import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.IntMap; @@ -14,6 +10,7 @@ import com.github.tommyettinger.textra.TextraButton; import com.github.tommyettinger.textra.TextraLabel; import forge.Forge; import forge.adventure.player.AdventurePlayer; +import forge.adventure.stage.GameHUD; import forge.adventure.util.Controls; import forge.adventure.util.Current; @@ -168,6 +165,8 @@ public class DeckSelectScene extends UIScene { buttons.get(i).layout(); } } + GameHUD.getInstance().pauseMusic(); + GameHUD.getInstance().playAudio(); select(Current.player().getSelectedDeckIndex()); performTouch(scrollPane); //can use mouse wheel if available to scroll after selection super.enter(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java index d3caa502bb0..28abdec2c81 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java @@ -3,8 +3,6 @@ package forge.adventure.scene; import forge.adventure.data.AdventureEventData; import forge.adventure.stage.GameHUD; import forge.screens.FScreen; -import forge.sound.MusicPlaylist; -import forge.sound.SoundSystem; /** * DraftScene @@ -34,7 +32,7 @@ public class DraftScene extends ForgeScene { public void enter() { GameHUD.getInstance().getTouchpad().setVisible(false); GameHUD.getInstance().pauseMusic(); - SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); + GameHUD.getInstance().playAudio(); screen = null; getScreen(); screen.refresh(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java index e0a72afba68..1489c1fce7c 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java @@ -1,7 +1,10 @@ package forge.adventure.scene; import com.badlogic.gdx.scenes.scene2d.InputEvent; -import com.badlogic.gdx.scenes.scene2d.ui.*; +import com.badlogic.gdx.scenes.scene2d.ui.Image; +import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; +import com.badlogic.gdx.scenes.scene2d.ui.Table; +import com.badlogic.gdx.scenes.scene2d.ui.Window; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; @@ -11,17 +14,18 @@ import com.github.tommyettinger.textra.TextraLabel; import com.github.tommyettinger.textra.TypingLabel; import forge.Forge; import forge.adventure.character.EnemySprite; -import forge.adventure.data.*; +import forge.adventure.data.AdventureEventData; +import forge.adventure.data.DialogData; import forge.adventure.player.AdventurePlayer; import forge.adventure.stage.GameHUD; import forge.adventure.stage.IAfterMatch; import forge.adventure.stage.WorldStage; -import forge.adventure.util.*; +import forge.adventure.util.AdventureEventController; +import forge.adventure.util.Controls; +import forge.adventure.util.Current; import forge.adventure.world.WorldSave; import forge.gui.FThreads; import forge.screens.TransitionScreen; -import forge.sound.MusicPlaylist; -import forge.sound.SoundSystem; import forge.util.Callback; import forge.util.MyRandom; @@ -381,7 +385,7 @@ public class EventScene extends MenuScene implements IAfterMatch { public void enter() { super.enter(); GameHUD.getInstance().pauseMusic(); - SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); + GameHUD.getInstance().playAudio(); scrollContainer.clear(); if (money != null) { diff --git a/forge-gui-mobile/src/forge/adventure/scene/InnScene.java b/forge-gui-mobile/src/forge/adventure/scene/InnScene.java index 3477ea49476..da33a4bd209 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/InnScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/InnScene.java @@ -12,8 +12,6 @@ import forge.adventure.util.AdventureEventController; import forge.adventure.util.Controls; import forge.adventure.util.Current; import forge.adventure.world.WorldSave; -import forge.sound.MusicPlaylist; -import forge.sound.SoundSystem; /** * Scene for the Inn in towns @@ -101,7 +99,7 @@ public class InnScene extends UIScene { super.enter(); refreshStatus(); GameHUD.getInstance().pauseMusic(); - SoundSystem.instance.setBackgroundMusic(MusicPlaylist.TOWN); + GameHUD.getInstance().playAudio(); } private void refreshStatus(){ diff --git a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java index 696150e8d28..7ada1616077 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java @@ -32,8 +32,6 @@ import forge.localinstance.achievements.CardActivationAchievements; import forge.localinstance.achievements.PlaneswalkerAchievements; import forge.model.FModel; import forge.player.GamePlayerUtil; -import forge.sound.MusicPlaylist; -import forge.sound.SoundSystem; import org.apache.commons.lang3.tuple.Pair; import java.util.Map; @@ -191,7 +189,7 @@ public class PlayerStatisticScene extends UIScene { super.enter(); GameHUD.getInstance().pauseMusic(); - SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); + GameHUD.getInstance().playAudio(); achievementContainer.clear(); updateAchievements(cardActivation, true); diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java index fb654eb360c..54fd5febf0b 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java @@ -52,7 +52,7 @@ public class RewardScene extends UIScene { Type type; Array generated = new Array<>(); - static public final float CARD_WIDTH =550f ; + static public final float CARD_WIDTH = 550f ; static public final float CARD_HEIGHT = 400f; static public final float CARD_WIDTH_TO_HEIGHT = CARD_WIDTH / CARD_HEIGHT; diff --git a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java index d3fdb19104b..917e961c4c0 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java @@ -152,6 +152,11 @@ public class SpellSmithScene extends UIScene { if (it.size() == 0) return false; return (!Arrays.asList(Config.instance().getConfigData().restrictedEditions).contains(input.getCode())); + }).sorted(new Comparator() { + @Override + public int compare(CardEdition e1, CardEdition e2) { + return e1.getName().compareTo(e2.getName()); + } }).collect(Collectors.toList()); }