From b65e3a3a34c8446854b2888f8a338a4ea5a8beb5 Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:43:09 -0500 Subject: [PATCH 1/3] Adventure - Enable "Continue" button for BO3 duels --- .../src/forge/screens/match/winlose/ViewWinLose.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index 4a2a0d16286..9f9265997f7 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -201,16 +201,10 @@ public class ViewWinLose extends FOverlay implements IWinLoseView { h = height / 12; if (Forge.isMobileAdventureMode) { - if (game.getGameType() == GameType.AdventureEvent) { - btnContinue.setBounds(x, y, w, h); - y += h + dy; - } - else{ - btnContinue.setVisible(false); - } + btnContinue.setBounds(x, y, w, h); + y += h + dy; btnQuit.setBounds(x, y, w, h); y += h + dy; - btnRestart.setVisible(false); } else { if (btnContinue.isEnabled()) { From 8948193bd6c06f47e4cbf0b7cc0bd39fdf3469d7 Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:51:32 -0500 Subject: [PATCH 2/3] Adventure - Enable "Continue" button for BO3 duels --- .../src/forge/screens/match/winlose/ViewWinLose.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index 9f9265997f7..c2e0ae45ef7 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -201,10 +201,16 @@ public class ViewWinLose extends FOverlay implements IWinLoseView { h = height / 12; if (Forge.isMobileAdventureMode) { - btnContinue.setBounds(x, y, w, h); - y += h + dy; + if (game.getNumGamesInMatch() > 1) { + btnContinue.setBounds(x, y, w, h); + y += h + dy; + } + else{ + btnContinue.setVisible(false); + } btnQuit.setBounds(x, y, w, h); y += h + dy; + btnRestart.setVisible(false); } else { if (btnContinue.isEnabled()) { From ebf2ed5a55b2c4cc958bdcf17ffeb9bb0e137053 Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:59:00 -0500 Subject: [PATCH 3/3] Removing unused import --- .../src/forge/screens/match/winlose/ViewWinLose.java | 1 - 1 file changed, 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index c2e0ae45ef7..080d657ad55 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -2,7 +2,6 @@ package forge.screens.match.winlose; import java.util.List; -import forge.game.GameType; import org.apache.commons.lang3.StringUtils; import com.badlogic.gdx.Input.Keys;