From 5cf63692a87eaffc393a2ecc09e18fbbba2e77f5 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Fri, 15 Jun 2018 22:01:20 +0100 Subject: [PATCH] Fixed legacy and vintage deck generation for gauntlets on desktop and android --- .../forge/screens/home/gauntlet/VSubmenuGauntletQuick.java | 6 ++++++ .../src/forge/screens/gauntlet/NewGauntletScreen.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java index f6674c97c4c..d01810b33d0 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java @@ -90,9 +90,13 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { if(FModel.isdeckGenMatrixLoaded()) { boxStandardCardgenDecks.setSelected(true); boxModernCardgenDecks.setSelected(true); + boxLegacyCardgenDecks.setSelected(true); + boxVintageCardgenDecks.setSelected(true); }else{ boxStandardCardgenDecks.setSelected(false); boxModernCardgenDecks.setSelected(false); + boxLegacyCardgenDecks.setSelected(false); + boxVintageCardgenDecks.setSelected(false); } boxModernColorDecks.setSelected(true); @@ -119,6 +123,8 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { if(FModel.isdeckGenMatrixLoaded()) { pnlOptions.add(boxStandardCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); pnlOptions.add(boxModernCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); + pnlOptions.add(boxLegacyCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); + pnlOptions.add(boxVintageCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); } pnlOptions.add(boxStandardColorDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); pnlOptions.add(boxModernColorDecks, "w 96%!, h 30px!, gap 2% 0 0 0"); diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java index 5bc8e293ca5..869730c6237 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java @@ -82,7 +82,7 @@ public class NewGauntletScreen extends LaunchScreen { if (numOpponents == null) { return; } ListChooser chooser = new ListChooser( - "Choose allowed deck types for opponents", 0, 9, Arrays.asList(new DeckType[] { + "Choose allowed deck types for opponents", 0, 11, Arrays.asList(new DeckType[] { DeckType.CUSTOM_DECK, DeckType.PRECONSTRUCTED_DECK, DeckType.QUEST_OPPONENT_DECK,