diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java index 307a183cb32..e6c7031140a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java @@ -83,6 +83,7 @@ public enum CSubmenuGauntletQuick implements ICDoc { if (view.getBoxLegacyGenDecks().isSelected()) { allowedDeckTypes.add(DeckType.LEGACY_CARDGEN_DECK); } if (view.getBoxVintageGenDecks().isSelected()) { allowedDeckTypes.add(DeckType.VINTAGE_CARDGEN_DECK); } if (view.getBoxModernColorDecks().isSelected()) { allowedDeckTypes.add(DeckType.MODERN_COLOR_DECK); } + if (view.getBoxPauperColorDecks().isSelected()) { allowedDeckTypes.add(DeckType.PAUPER_COLOR_DECK); } if (view.getBoxThemeDecks().isSelected()) { allowedDeckTypes.add(DeckType.THEME_DECK); } if (view.getBoxUserDecks().isSelected()) { allowedDeckTypes.add(DeckType.CUSTOM_DECK); } if (view.getBoxQuestDecks().isSelected()) { allowedDeckTypes.add(DeckType.QUEST_OPPONENT_DECK); } 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 afb6e2d03f8..309f4250f9e 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 @@ -65,6 +65,7 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { private final JCheckBox boxLegacyCardgenDecks = new FCheckBox(DeckType.LEGACY_CARDGEN_DECK.toString()); private final JCheckBox boxVintageCardgenDecks = new FCheckBox(DeckType.VINTAGE_CARDGEN_DECK.toString()); private final JCheckBox boxModernColorDecks = new FCheckBox(DeckType.MODERN_COLOR_DECK.toString()); + private final JCheckBox boxPauperColorDecks = new FCheckBox(DeckType.PAUPER_COLOR_DECK.toString()); private final JCheckBox boxThemeDecks = new FCheckBox(DeckType.THEME_DECK.toString()); private final FDeckChooser lstDecks = new FDeckChooser(null, false, GameType.Constructed, false); @@ -105,6 +106,7 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { boxVintageCardgenDecks.setSelected(false); } boxModernColorDecks.setSelected(true); + boxPauperColorDecks.setSelected(true); sliOpponents.setMajorTickSpacing(5); sliOpponents.setMinorTickSpacing(0); @@ -134,7 +136,8 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { 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"); + pnlOptions.add(boxModernColorDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); + pnlOptions.add(boxPauperColorDecks, "w 96%!, h 30px!, gap 2% 0 0 0"); } public void updateDeckPanel() { @@ -221,6 +224,10 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { return boxModernColorDecks; } + public JCheckBox getBoxPauperColorDecks() { + return boxPauperColorDecks; + } + /** @return {@link javax.swing.JCheckBox} */ public JCheckBox getBoxStandardGenDecks() { return boxStandardCardgenDecks; diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java index 58ab25885e7..178beecfb75 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java @@ -58,6 +58,9 @@ public class GauntletUtil { case MODERN_COLOR_DECK: deck = DeckgenUtil.getRandomColorDeck(FModel.getFormats().getModern().getFilterPrinted(),true); break; + case PAUPER_COLOR_DECK: + deck = DeckgenUtil.getRandomColorDeck(FModel.getFormats().getPauper().getFilterPrinted(), true); + break; case CUSTOM_DECK: deck = DeckgenUtil.getRandomCustomDeck(); if (deck != null) { // fall back to precon if none available