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

..

Browse Source
This commit is contained in:
Anthony Calosa
2023-06-29 22:48:35 +08:00
parent f5d4c7c87a
commit 65bba54900
7 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
View File

@@ -165,8 +165,7 @@ public class DeckSelectScene extends UIScene {
buttons.get(i).layout(); buttons.get(i).layout();
} }
} }
GameHUD.getInstance().pauseMusic(); GameHUD.getInstance().switchAudio();
GameHUD.getInstance().playAudio();
select(Current.player().getSelectedDeckIndex()); select(Current.player().getSelectedDeckIndex());
performTouch(scrollPane); //can use mouse wheel if available to scroll after selection performTouch(scrollPane); //can use mouse wheel if available to scroll after selection
super.enter(); super.enter();

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

@@ -31,8 +31,7 @@ public class DraftScene extends ForgeScene {
@Override @Override
public void enter() { public void enter() {
GameHUD.getInstance().getTouchpad().setVisible(false); GameHUD.getInstance().getTouchpad().setVisible(false);
GameHUD.getInstance().pauseMusic(); GameHUD.getInstance().switchAudio();
GameHUD.getInstance().playAudio();
screen = null; screen = null;
getScreen(); getScreen();
screen.refresh(); screen.refresh();

8
forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
View File

@@ -153,13 +153,7 @@ public class DuelScene extends ForgeScene {
void afterGameEnd(String enemyName, boolean winner) { void afterGameEnd(String enemyName, boolean winner) {
Forge.restrictAdvMenus = winner; Forge.restrictAdvMenus = winner;
endRunnable = () -> Gdx.app.postRunnable(()-> { endRunnable = () -> Gdx.app.postRunnable(()-> {
if (GameScene.instance().isNotInWorldMap()) { GameHUD.getInstance().switchAudio();
SoundSystem.instance.pause();
GameHUD.getInstance().playAudio();
} else {
SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
SoundSystem.instance.resume();
}
dungeonEffect = null; dungeonEffect = null;
callbackExit = false; callbackExit = false;
Forge.clearTransitionScreen(); Forge.clearTransitionScreen();

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

@@ -384,8 +384,7 @@ public class EventScene extends MenuScene implements IAfterMatch {
@Override @Override
public void enter() { public void enter() {
super.enter(); super.enter();
GameHUD.getInstance().pauseMusic(); GameHUD.getInstance().switchAudio();
GameHUD.getInstance().playAudio();
scrollContainer.clear(); scrollContainer.clear();
if (money != null) { if (money != null) {

3
forge-gui-mobile/src/forge/adventure/scene/InnScene.java
View File

@@ -98,8 +98,7 @@ public class InnScene extends UIScene {
public void enter() { public void enter() {
super.enter(); super.enter();
refreshStatus(); refreshStatus();
GameHUD.getInstance().pauseMusic(); GameHUD.getInstance().switchAudio();
GameHUD.getInstance().playAudio();
} }
private void refreshStatus(){ private void refreshStatus(){

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

@@ -187,10 +187,7 @@ public class PlayerStatisticScene extends UIScene {
@Override @Override
public void enter() { public void enter() {
super.enter(); super.enter();
GameHUD.getInstance().switchAudio();
GameHUD.getInstance().pauseMusic();
GameHUD.getInstance().playAudio();
achievementContainer.clear(); achievementContainer.clear();
updateAchievements(cardActivation, true); updateAchievements(cardActivation, true);
updateAchievements(planeswalkers, true); updateAchievements(planeswalkers, true);

6
forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
View File

@@ -385,6 +385,12 @@ public class GameHUD extends Stage {
private Pair<FileHandle, Music> audio = null; private Pair<FileHandle, Music> audio = null;
public void switchAudio() {
if (GameScene.instance().isNotInWorldMap()) {
pauseMusic();
playAudio();
}
}
public void playAudio() { public void playAudio() {
switch (GameScene.instance().getAdventurePlayerLocation(false, false)) { switch (GameScene.instance().getAdventurePlayerLocation(false, false)) {
case "capital": case "capital":